Merge "hikey960: update self-extractors" am: 347ffb7839 am: f9a00e170e
am: f1d397ef4f

Change-Id: I2d128655f3660fdaa22f16dfa333e1227472c540