Merge "hikey960: update self-extractors"