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