Merge "RegisterNativeAllocation: avoid an extraneous blocking gc." am: 11010c3aa0
am: 2bca85d302

Change-Id: Id4a34a0eda956ebf40a26d34da526661f0642b92