Merge "Revert "Revert "Redesign implementation of RegisterNativeAllocation."""
am: 61d5208804

Change-Id: I8d6363503a805761fa9bd4771c970bea542c848a