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

Change-Id: Ide4272bfd0a4087defc5b46b5ec3a0cb059ac870