Merge "HiKey/HiKey960: Migrate setprop calls to PRODUCT_PRODUCT_PROPERTIES" am: c6b20e29fe am: 9dcef11496
am: 43bae43267

Change-Id: I520b777d73eafc148a06c5110dc9c39b334662f8