Jenkins 11952 Emulator occasionally hangs indefinitely on startup, unable to connect adb

Tested and all seems to work fine. It needs wider testing to be confident that the changes are a full fix but I cannot see anything that makes things any worse.