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

Change-Id: I8d8b6250a588f2537370d1413ddf18efa3c142aa