Crashes testing libcore on host/x86. Bug:22866717 This reverts commit 08624c50. Change-Id: Ia8f130d9ea32e171e554bd3e10c44f8453111b52