Merge "Only attempt to load .apk files in AssetManager"