Merge 5210fc13cc2d7599a75e11c49b193f9a1bbb0a43 on remote branch

Change-Id: Id39e7ff329bb102e41af07e47b51764295f6f9ee
diff --git a/srcs/Android.bp b/srcs/Android.bp
index 091fd63..37bb396 100644
--- a/srcs/Android.bp
+++ b/srcs/Android.bp
@@ -18,4 +18,10 @@
     srcs: ["**/*.sysprop"],
     property_owner: "Platform",
     api_packages: ["android.sysprop"],
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
 }