Merge "Reduce flakiness of 004-NativeAllocations test."
am: 7f90dc414f

Change-Id: I53c045f6fa7b0f9a3e8fc999c920e97b586cf4dd