This reverts commit 65dcb3ab. The Mac infra bot fails unable to run `android update sdk`
Attach a file by drag & drop or click to upload
