android: fix M emulator package roll.

Mistakenly updated the system image package instance ID rather than the
avd package instance ID in crrev.com/c/2003563.

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

tools/android/avd/proto/generic_android23.textpb

@@ -12,14 +12,14 @@ emulator_package {
 
 system_image_package {
   package_name: "chromium/third_party/android_sdk/public/system-images/android-23/google_apis/x86"
-  version: "Pum5ZEuBD0Xk8kVS2iM_UXCwIYqNs-d6i8cvNDN0ShIC"
+  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: "mb3GT1LoU3geakFsLpofC13LiHxq-GxFEqHSufjlNacC"
+  version: "Pum5ZEuBD0Xk8kVS2iM_UXCwIYqNs-d6i8cvNDN0ShIC"
   dest_path: ".android"
 }
 avd_name: "android_23_google_apis_x86"