Merge pull request #2266 from jlipps/master

update uiauto to take advantage of new hideKeyboard strategy (fix #1153)
add avdLaunchTimeout/avdReadyTimeout (fix #2247)
and retry launching emulator once if it doesn't connect (fix #1820)