Merge "Change registerNativeAllocation to long argument"