Snap for 9576141 from a33c028be4481b35825e81e36340a23841b50fad to udc-release

Change-Id: I9b6373d2adad478f146ba813f8a3632f2a1723e9
diff --git a/Android.bp b/Android.bp
index 588e226..3868e27 100644
--- a/Android.bp
+++ b/Android.bp
@@ -96,6 +96,10 @@
     ],
     // being part of updatable apexes, this should work on older releases
     min_sdk_version: "apex_inherit",
+    // sdk_version normally isn't needed as only the platform variant
+    // is used, except on riscv64 which doesn't have an NDK libc++ and
+    // reuses this module for sdk variants.
+    sdk_version: "current",
     native_bridge_supported: true,
     srcs: [
         "src/algorithm.cpp",
@@ -161,6 +165,10 @@
     ],
     // being part of updatable apexes, this should work on older releases
     min_sdk_version: "apex_inherit",
+    // sdk_version normally isn't needed as only the platform variant
+    // is used, except on riscv64 which doesn't have an NDK libc++ and
+    // reuses this module for sdk variants.
+    sdk_version: "current",
     whole_static_libs: ["libc++_static"],
     stl: "none",