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

Change-Id: Ic6687911dadf4039d4aec268f8cf6d34f2eed39a