updates for android dev and .gitconfig