Update Android sdk
Merge branch 'master' of github.com:cmavromoustakos/dotfiles

Conflicts:
	zshenv