Merge "Fix ApkAssets mNativePtr accesses"