Snap for 6533464 from 05a64f28eaebc273b4e4857052964e2683926a71 to sdk-release

Change-Id: Ifd527af70e8c9efe0d67352f019f2e4e23cec8a5
diff --git a/Android.bp b/Android.bp
index 60acf7e..625b503 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,11 @@
     ],
     host_supported: true,
     device_supported: true,
+
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 cc_library_headers {
@@ -50,6 +55,11 @@
         "src/solaris/npt",
     ],
     defaults: ["upstream-jdwp-defaults"],
+
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 cc_library {
@@ -79,6 +89,11 @@
     generated_headers: ["jdwp_generated_headers"],
     export_generated_headers: ["jdwp_generated_headers"],
     defaults: ["upstream-jdwp-defaults"],
+
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 cc_library {