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

Change-Id: Ic6b4289c790ffd76193c9bc26e2e9c2d07764671