Bug 1326492 - Update avd manifests for 'mach android-emulator', r=jmaher

I created a new Android 4.3 AVD and uploaded it to tooltool. This new
AVD is compatible with the "new" emulator included in recent versions
of the Android SDK (circa Android SDK Tools 25). To avoid destabilizing
the emulator automated tests run via taskcluster and mozharness, I'm
creating a new tooltool manifest for the new AVD and using it only from
mach android-emulator.

For consistency, I'm creating separate but identical manifests for x86,
renaming the mach-only 6.0 manifest, and deleting the old 2.3 manifest.

--HG--
rename : testing/config/tooltool-manifests/androidarm_6_0/releng.manifest => testing/config/tooltool-manifests/androidarm_6_0/mach-emulator.manifest

testing/config/tooltool-manifests/androidarm/releng.manifest

@@ -1,9 +0,0 @@
-[
-{
-"size": 65331941,
-"digest": "e938dda22a52eccfc2a56e4cda898cad15b9679eb9785816f3ae027983788b5a53f645ecb6a44f30f881b0ca2f69e4ab6f96da160aaca816b8f1b58d3fb20ca8",
-"algorithm": "sha512",
-"filename": "AVDs-armv7a-gingerbread-build-2015-08-17-ubuntu.tar.gz",
-"unpack": true
-}
-]

testing/config/tooltool-manifests/androidarm_4_3/mach-emulator.manifest

@@ -0,0 +1,9 @@
+[
+{
+"size": 138436966,
+"digest": "25463edb2ebec6db0a2ebe72802d6b59fbfbce638bd4629f97842b197f674666dfdfd660dd2d0dd7542deba660ede20314402054b6e0866c9741c8fbd824eb91",
+"algorithm": "sha512",
+"filename": "AVDs-armv7a-android-4.3.1_r1-build-2017-03-09.tar.gz",
+"unpack": true
+}
+]

testing/config/tooltool-manifests/androidx86/mach-emulator.manifest

@@ -0,0 +1,10 @@
+[
+{
+"size": 140180128,
+"visibility": "public",
+"digest": "09a3ef5dc9f91a80ab5f4b82200665eb30cae44681c5cbbfdbf0496b038fc44cb277041011fe77489cfb37d3715c723b67418650e503a80e4d7093094339d26f",
+"algorithm": "sha512",
+"filename": "AVDs-x86-android-4.2_r1-build-2016-11-18.tar.gz",
+"unpack": true
+}
+]

testing/mozbase/mozrunner/mozrunner/devices/android_device.py

@@ -55,19 +55,19 @@ class AvdInfo(object):
 AVD_DICT = {
     '4.3': AvdInfo('Android 4.3',
                    'mozemulator-4.3',
-                   'testing/config/tooltool-manifests/androidarm_4_3/releng.manifest',
+                   'testing/config/tooltool-manifests/androidarm_4_3/mach-emulator.manifest',
                    ['-show-kernel', '-debug',
                     'init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket'],
                    5554),
     '6.0': AvdInfo('Android 6.0',
                    'mozemulator-6.0',
-                   'testing/config/tooltool-manifests/androidarm_6_0/releng.manifest',
+                   'testing/config/tooltool-manifests/androidarm_6_0/mach-emulator.manifest',
                    ['-show-kernel', '-debug',
                     'init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket'],
                    5554),
     'x86': AvdInfo('Android 4.2 x86',
                    'mozemulator-x86',
-                   'testing/config/tooltool-manifests/androidx86/releng.manifest',
+                   'testing/config/tooltool-manifests/androidx86/mach-emulator.manifest',
                    ['-debug',
                     'init,console,gles,memcheck,adbserver,adbclient,adb,avd_config,socket',
                     '-qemu', '-m', '1024', '-enable-kvm'],