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

Change-Id: I3638b84ea2b341046fb476263411ec41594ff0a7