Merge "Revert "Change default dalvik.vm.jdwp-provider to adbconnection""
am: e714e96e78

Change-Id: I410062b6f49f2533f55d1f818fc5e2894636570d