Changed to language:android again and added wait-for-emulator script.