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

Change-Id: I2be65fc31a8b90ee5c3599af948f04225b466714