Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ib590259bb9420ae3f908e77c5c8e86c36a200163
diff --git a/Android.bp b/Android.bp
index 625b503..492b88d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,8 +43,8 @@
     device_supported: true,
 
     apex_available: [
+        "com.android.art",
         "com.android.art.debug",
-        "com.android.art.release",
     ],
 }
 
@@ -57,8 +57,8 @@
     defaults: ["upstream-jdwp-defaults"],
 
     apex_available: [
+        "com.android.art",
         "com.android.art.debug",
-        "com.android.art.release",
     ],
 }
 
@@ -74,7 +74,7 @@
     ],
     defaults: ["upstream-jdwp-defaults"],
     apex_available: [
-        "com.android.art.release",
+        "com.android.art",
         "com.android.art.debug",
     ],
 }
@@ -91,8 +91,8 @@
     defaults: ["upstream-jdwp-defaults"],
 
     apex_available: [
+        "com.android.art",
         "com.android.art.debug",
-        "com.android.art.release",
     ],
 }
 
@@ -124,7 +124,7 @@
     ],
     defaults: ["upstream-jdwp-defaults"],
     apex_available: [
-        "com.android.art.release",
+        "com.android.art",
         "com.android.art.debug",
     ],
 }
@@ -147,7 +147,7 @@
     required: ["libnpt"],
     defaults: ["upstream-jdwp-defaults"],
     apex_available: [
-        "com.android.art.release",
+        "com.android.art",
         "com.android.art.debug",
     ],
 }