Add Android tools to the search path.
Update repo to 1.19.
Merge remote-tracking branch 'origin/master'

Conflicts:
	bashrc