am c3b58d4a: Merge "Allow goldfish-setup to put the emulator in WiFi-only mode"

* commit 'c3b58d4a8fd89df6122b7b2fdcd7975dc6e2c45b':
  Allow goldfish-setup to put the emulator in WiFi-only mode