Merge bd96b8be5bf9faab40f331d6b1a908bb40003d0b on remote branch

Change-Id: I5f66dbc023161aaacf109fbf28f1841636179381
diff --git a/C/Android.bp b/C/Android.bp
index 4159054..16f72b7 100644
--- a/C/Android.bp
+++ b/C/Android.bp
@@ -82,4 +82,10 @@
             ],
         },
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.debug", // from libartbase
+        "com.android.art.release",
+    ],
 }