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

Change-Id: I24b272d2321c2d44090c7492a347b9f508f49634