Merge "Self-extractors for IML70C" into stage-aosp-master