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

Change-Id: I237235ac109d6edf0d7ed894d1f361a80d111b78