Merge "Revert "Workaround JDWP failures""
am: 506cf19829

* commit '506cf19829ba61e9ad6e34e2c811cff097c2a6b5':
  Revert "Workaround JDWP failures"