Merge changes Ia4244757,Ibcdf69d9

* changes:
  adbd: clean up jdwp service a bit.
  Revert "Revert "adb: detect some spin loops and abort.""