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

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