Merge "Fixing app compat issue b/72143978" am: 8353a39ecc

am: 61bab24fa8

Change-Id: I6f07f1d9cfd26aa8b93a2563349b5e40effb7a41

native/graphics/jni/Android.bp

@@ -30,6 +30,13 @@ cc_library_shared {
         "libandroid_runtime",
         "libskia",
     ],
+
+    arch: {
+        arm: {
+            // TODO: This is to work around b/24465209. Remove after root cause is fixed
+            ldflags: ["-Wl,--hash-style=both"],
+        },
+    },
 }
 
 // The headers module is in frameworks/native/Android.bp.