CHANGED: Use standard android-wait-for-emulator script