Merge "Revert "HiKey/HiKey960: Set PRODUCT_SHIPPING_LEVEL to 29""