Merge pull request #2262 from jlipps/master

make sure binaries found using which/where get added to adb.binaries
ensure we can use appium 1.0 style launch information from the command line (fix #2231)