Merge "Set apex_available for okhttp" am: 518242f5e6 am: ecf245153b

Change-Id: Iad7cdeeb1e10d27e7f24f0c663121b7a1b96901b

Android.bp

diff --git a/Android.bp b/Android.bp
index ee7ff2f..775ee88 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,6 +81,10 @@
         "conscrypt.module.intra.core.api.stubs",
     ],
     java_version: "1.7",
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 // A guaranteed unstripped version of okhttp.