Merge "Correct registerNativeAllocation type"
am: fe015a098c

Change-Id: Ie202df6d1f36534d5bea0e65aa21570be891b5b4