Bug: 30951794 Test: mm -j24 run-jdwp-tests-host (cherry-picked from commit be5386b8) Change-Id: I2e8e693a9a4b921b55c7965262dd90cd3f67fcfa