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

Change-Id: I1533269d456414f49abddb2cc819968477f0f458