Another attempt to fix Travis

* Reverts emulator start script name to the packaged script
* Changes build tools version to one listed at http://docs.travis-ci.com/user/languages/android/#Pre-installed-components
* Update wait_for_emulator script to the latest version referenced at http://docs.travis-ci.com/user/languages/android/#How-to-Create-and-Start-an-Emulator