Bug: 30951794 Test: mm -j24 run-jdwp-tests-host This reverts commit 6f48d4c7. This also includes the reversion of commit 528954f5. Change-Id: If0b2ae39cb2a9db80b567bb8d5761d504433632d