Breaks jdwp tests. Bug: 22720414 This reverts commit 566fc926. Change-Id: Ic3544e86af35bf748f9d47e0a4077dcdc206a821