target api 19
Merge remote-tracking branch 'origin/master'

Conflicts:
	.travis_install_android_sdk.sh