add abi support for emulator.py

build/android/emulator.py

Index: build/android/emulator.py
diff --git a/build/android/emulator.py b/build/android/emulator.py
index 6b53416e8e5df2a825a79cc97cbd347b09f093de..7c3f66887abeafe62c9dfd41d832e10f818cd9e1 100755
--- a/build/android/emulator.py
+++ b/build/android/emulator.py
@@ -148,6 +148,9 @@ class Emulator(object):
     if not self.fast_and_loose:
       self._AggressiveImageCleanup()
     (self.device, port) = self._DeviceName()
+    abi = 'armeabi'
+    if 'x86' in os.environ.get('TARGET_PRODUCT', ''):
+      abi = 'x86'
     emulator_command = [
         self.emulator,
         # Speed up emulator launch by 40%.  Really.
@@ -156,7 +159,7 @@ class Emulator(object):
         # That's not enough for 8 unit test bundles and their data.
         '-partition-size', '512',
         # Use a familiar name and port.
-        '-avd', 'avd_armeabi',
+        '-avd', 'avd_' + abi,
         '-port', str(port)]
     if not self.fast_and_loose:
       emulator_command.extend([