Merge af6d6a88bcb507bdb5ae749c19322077fc5beefa on remote branch

Change-Id: I0786ff9ecfbf5ae3174934f41e90cdfc7a15e139
diff --git a/Android.bp b/Android.bp
index e31b571..56a2832 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,6 +47,10 @@
     defaults: ["libc++abi_defaults"],
     host_supported: false,
     srcs: ["src/cxa_demangle.cpp"],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
 }
 
 cc_library_static {
@@ -136,4 +140,8 @@
             ],
         }
     },
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
 }