Merge "Migrate ApkAssets to use NativeAllocationRegistry"