Merge "hikey960: Fix up factory image script" am: 9d39f63157 am: 42dc413ced
am: 06dc7f6163

Change-Id: Idd25164f314fa0956e0ae466a62cd722cfa2c1cf