This reverts commit 7b39a392. Fails jdwp tests on target. Bug: 109505014 Change-Id: Ib8a278bc8c8137e1f1397e3e881d652504fea96f