Change to new android sdk
Changed git config to branch matching simple, update omzsh