add avdLaunchTimeout/avdReadyTimeout (fix #2247)
and retry launching emulator once if it doesn't connect (fix #1820)
Merge pull request #2267 from jlipps/master

add avdLaunchTimeout/avdReadyTimeout (fix #2247)