Add Android path variables to .bash_profile file.
Merge remote-tracking branch 'origin/master'