This reverts commit 65dcb3ab03. The Mac infra bot fails unable to run `android update sdk`
65dcb3ab03