Fix AVD configuration and defaults based on dogfooder input.

build/android/avd.py

Index: build/android/avd.py
diff --git a/build/android/avd.py b/build/android/avd.py
index c9da30f199f34b127f448821551b0016e3d049e0..2685c592bedf4d4f276169a99741b3d374f6d377 100755
--- a/build/android/avd.py
+++ b/build/android/avd.py
@@ -23,20 +23,18 @@ from pylib.utils import emulator
 def main(argv):
   # ANDROID_SDK_ROOT needs to be set to the location of the SDK used to launch
   # the emulator to find the system images upon launch.
-  emulator_sdk = os.path.join(constants.EMULATOR_SDK_ROOT, 'android_tools',
-                              'sdk')
+  emulator_sdk = os.path.join(constants.EMULATOR_SDK_ROOT,
+                              'android_tools', 'sdk')
   os.environ['ANDROID_SDK_ROOT'] = emulator_sdk
 
   opt_parser = optparse.OptionParser(description='AVD script.')
   opt_parser.add_option('-n', '--num', dest='emulator_count',
-                        help='Number of emulators to launch.',
+                        help='Number of emulators to launch (default is 1).',
                         type='int', default='1')
-  opt_parser.add_option('--abi', default='arm',
-                        help='Platform of emulators to launch.')
+  opt_parser.add_option('--abi', default='x86',
+                        help='Platform of emulators to launch (x86 default).')
 
   options, _ = opt_parser.parse_args(argv[1:])
-  if options.abi == 'arm':
-    options.abi = 'armeabi-v7a'
 
   logging.basicConfig(level=logging.INFO,
                       format='# %(asctime)-15s: %(message)s')
@@ -45,8 +43,8 @@ def main(argv):
   # Check if KVM is enabled for x86 AVD's and check for x86 system images.
   if options.abi =='x86':
     if not install_emulator_deps.CheckKVM():
-      logging.critical('ERROR: KVM must be enabled in BIOS, and installed. Run '
-                       'install_emulator_deps.py')
+      logging.critical('ERROR: KVM must be enabled in BIOS, and installed. '
+                       'Enable KVM in BIOS and run install_emulator_deps.py')
       return 1
     elif not install_emulator_deps.CheckX86Image():
       logging.critical('ERROR: System image for x86 AVD not installed. Run '