Rename setups and add provider reauthentication

app/run-android.sh

@@ -9,7 +9,7 @@
 # emulator" is three places for the memory check that was missing from all of
 # them.
 #
-# Environment setup (SDK location, PATH, ...) lives in ./android-env.sh,
+# Environment machine (SDK location, PATH, ...) lives in ./android-env.sh,
 # which can also be sourced directly for one-off commands.
 set -eu