Adding more android tools to path.
I'd like to test homebrews android-sdk recipe, and maybe switch later.
Merge branch 'refactor/android'