Remove old HipChat API key from Travis CI config.
Use new 'android' language on Travis CI.
Merge remote-tracking branch 'origin/fix-instrumentation' into fix-instrumentation

Conflicts:
	.travis.yml