Snap for 7511134 from 25317fae42f5aa04b8c1a6ea31bc15804149b0ee to tm-release

Change-Id: Ib8fc1f1d4880b1f7afb175829b919d07209e97a9
diff --git a/Android.bp b/Android.bp
index 62493b4..75a461c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -70,13 +70,6 @@
 ndk_prebuilt_shared_stl {
     name: "ndk_libc++_shared",
     export_include_dirs: libcxx_includes,
-    multilib: {
-        lib32: {
-            export_include_dirs: [
-                "current/sources/android/support/include",
-            ],
-        },
-    }
 }
 
 cc_library_static {