Merge "Revert "RegisterNativeAllocation: Avoid case of double blocking gc."" am: a774575ae3
am: 61c8221d2d

Change-Id: Ic20f10ffbf7972b074e305b574fa4dc6b67daa7d