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

Change-Id: Ie4d528606304c12196f952675af2831ef73ce5e1