This reverts commit 6bfc37d8. Test failures in 004-NativeAllocations. Bug: 29156652 Bug: 32576211 Change-Id: Ic54c67caf913024485a5c0621857d68a6fb710fa