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

Change-Id: If3dd08dc5e992bb3fa3885c2a26532b7d68b561b