Merge "Revert "Make idiomatic use of ApkAssets and AssetManager""