Merge "Remove support for loading extractors from apk"