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

Change-Id: Iecdf2594f3a57bc030e8f1c60584622bfd32576b