Merge changes I6d1231e5,I89559cc6

* changes:
  Revert^2 "Change default dalvik.vm.jdwp-provider to adbconnection"
  Refactor jdwp_provider to make it easier to change the default