fixes to adb support and random clean up
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidDebugShell/ads.jar
	AndroidDebugShell/plugins/plugins.jar
merge changes with upstream