Merge "Revert "HiKey/HiKey960: Set PRODUCT_SHIPPING_LEVEL to 29"" am: b0063d541b am: 503f5f827e
am: 7a209b2747

Change-Id: Ie3fe7a7e6caf57f5918ca898e02462d452801dcd