Snap for 7635729 from f3b16f22ddc40447c62aae69b54c3ad2c301b5c7 to mainline-ipsec-release

Change-Id: I1f30aea801926300d2fa7ca126a82face954e486
diff --git a/Android.bp b/Android.bp
index 49e26d2..53f8578 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,7 +54,7 @@
         "libspin",
         "libuntrusted",
     ],
-    static_libs: [
+    whole_static_libs: [
         "libring-core",
     ],
     apex_available: [