Merge "Adjust NativeAllocationRegistry for new accounting"