Merge pull request #2267 from jlipps/master

add avdLaunchTimeout/avdReadyTimeout (fix #2247)
if installing a remote apk fails, uninstall/rm and retry (fix #2188)