This reverts commit 89041472. Unittest failures of JvmtiHostTest1906#testJvmti. To do a clean revert of b3624743, we need to also revert this change. Test: compiles Bug: 121333210 Bug: 111338677