Merge "Remove obsolete self-extractors for hikey." am: a37e22f31c
am: 39abafe385

Change-Id: I1c570a99fe4cbf89d80e7ce1e327df77b3faeaf9