Merge "Revert "Change default dalvik.vm.jdwp-provider to adbconnection"" am: e714e96e am: 0f89f755 am: 0a091da7 Change-Id: I78fca87df09e5af345dfb14b08fdf9a14e093208