Merge "Revert "Revert "RegisterNativeAllocation: Avoid case of double blocking gc.""" am: 8e0a5dee37
am: da76bffc44

Change-Id: Ic5d2954bd707b231be171b66176a80f549c20733