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

Change-Id: I3be00b72a7f947125230823d8ebf19852ba63cb3