Merge "Link libvndksupport dynamically instead of statically." am: 4b33ccbb0e am: d8f23ce9c5 am: 7d2af6f86f

Change-Id: I69d948d1e8ec93066bc4f6c8a76f9cb598c91712
diff --git a/keystore/tests/Android.bp b/keystore/tests/Android.bp
index cb662d1..bbcc1c2 100644
--- a/keystore/tests/Android.bp
+++ b/keystore/tests/Android.bp
@@ -27,11 +27,11 @@
         "libkeystore_test",
         "liblog",
         "libutils",
-        "libvndksupport",
     ],
     shared_libs: [
         "libbinder",
         "libkeymaster_messages",
+        "libvndksupport",
     ],
    sanitize: {
      cfi: false,