Also update build-tools for Travis
Revert General Section add to fix null pointer crash
Get android-wait-for-emulator on server and run latest version
Remove branch param from build image url
Merge branch 'tanjot' into chaudhary