Merge "No longer call registerNativeAllocation"