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

Change-Id: I1bf15e2de018bd4a7127fe09df4483be81de0472