This reverts commit 3014c484. Bug: 30951794 Test: mm -j24 run-jdwp-tests-host Change-Id: Id23d2696c41ed89734b0db22decbcefd6dafe890