Add ANDROID_SDK to osx env
Merge branch 'master' of github:brianjriddle/dotfiles