android: switch M emulator bot to standalone AVD config & rename P AVD.

Bug: 922145
Change-Id: I51fa49a5bad90a46c57778829d67d5813af1a199
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1838533Reviewed-by: Andrew Luo <aluo@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Auto-Submit: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702654}

infra/config/cr-buildbucket.cfg

@@ -1189,6 +1189,7 @@ buckets {
         name: "android/avd_packager"
         properties_j: <<END
           avd_configs: [
+            "tools/android/avd/proto/generic_android23.textpb",
             "tools/android/avd/proto/generic_android28.textpb"
           ]
         END

testing/buildbot/mixins.pyl

@@ -481,32 +481,24 @@
   'marshmallow-x86-emulator': {
     '$mixin_append': {
       'args': [
-        '--avd-name=20190903T160000Z_android_23_google_apis_x86',
-        '--emulator-home=../../.android',
+        '--avd-config=../../tools/android/avd/proto/generic_android23.textpb',
       ],
     },
     'swarming': {
-      'cipd_packages': [
-        {
-          'cipd_package': 'chromium/third_party/android_sdk/public/avds/android-23/google_apis/x86',
-          'location': '.android',
-          'revision': 'cfoclSzHrFOS_AcwBL09RQ5PvJByQHu3MX6EbC5aWZIC',
+      'dimensions': {
+        'device_os': None,
+        'device_type': None,
       },
+      'named_caches': [
         {
-          'cipd_package': 'chromium/third_party/android_sdk/public/emulator',
-          'location': 'third_party/android_sdk/public',
-          'revision': 'f4WdgkPvDdVCE8zBWPzcSIj4N9WFhKp3CSKDWylXuLEC',
+          'name': 'avd_generic_android23',
+          'path': '.android',
         },
         {
-          'cipd_package': 'chromium/third_party/android_sdk/public/system-images/android-23/google_apis/x86',
-          'location': 'third_party/android_sdk/public',
-          'revision': 'npuCAATVbhmywZwGhI3tMoECTrBBzzyJLpjAPXqtmYYC',
-        },
-      ],
-      'dimensions': {
-        'device_os': None,
-        'device_type': None,
+          'name': 'system_images_android_23_google_apis_x86',
+          'path': '.emulator_sdk',
         },
+      ]
     },
   },
   'marshmallow_generic': {

tools/android/avd/proto/generic_android23.textpb

+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Configuration for a generic x86 android-23 AVD.
+
+emulator_package {
+  package_name: "chromium/third_party/android_sdk/public/emulator"
+  version: "xhyuoquVvBTcJelgRjMKZeoBVSQRjB7pLVJPt5C9saIC"
+  dest_path: ".emulator_sdk"
+}
+
+system_image_package {
+  package_name: "chromium/third_party/android_sdk/public/system-images/android-23/google_apis/x86"
+  version: "npuCAATVbhmywZwGhI3tMoECTrBBzzyJLpjAPXqtmYYC"
+  dest_path: ".emulator_sdk"
+}
+system_image_name: "system-images;android-23;google_apis;x86"
+
+avd_package {
+  package_name: "chromium/third_party/android_sdk/public/avds/android-23/google_apis/x86"
+  version: "cfoclSzHrFOS_AcwBL09RQ5PvJByQHu3MX6EbC5aWZIC"
+  dest_path: ".android"
+}
+avd_name: "android_23_google_apis_x86"

tools/android/avd/proto/generic_android28.textpb

@@ -22,4 +22,4 @@ avd_package {
   version: "J5MFTg7OhekLKsOX7bmkVTSCDzohydCvXrn4sJzy0xsC"
   dest_path: ".android"
 }
-avd_name: "20190716T160000Z_android_28_google_apis_x86"
+avd_name: "android_28_google_apis_x86"