Snap for 6533464 from d5482714b07f5160b16dbbf004bb6d7c2b4dac98 to sdk-release

Change-Id: I95dbdb864a7173a5a3742d49de7fc08f82c1059d
diff --git a/Android.bp b/Android.bp
index 0221ffc..4de1834 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,6 +51,12 @@
         "procmeminfo.cpp",
         "sysmeminfo.cpp",
     ],
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
 }
 
 cc_test {
diff --git a/libdmabufinfo/Android.bp b/libdmabufinfo/Android.bp
index 70533ea..7c3d9c0 100644
--- a/libdmabufinfo/Android.bp
+++ b/libdmabufinfo/Android.bp
@@ -44,6 +44,12 @@
             enabled: false,
         },
     },
+
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art.release",
+        "com.android.art.debug",
+    ],
 }
 
 cc_test {