Merge changes I3a2191b0,Ide1056b5 am: af13a8b744 am: b1463adad0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1409690

Change-Id: I26dfd2fe0eef8ebc9e8bbb6bcc1561a074a0a6da

adb/Android.bp

@@ -270,6 +270,8 @@ cc_library {
     host_supported: true,
     compile_multilib: "both",
     min_sdk_version: "apex_inherit",
+    // This library doesn't use build::GetBuildNumber()
+    use_version_lib: false,
 
     srcs: [
         "sysdeps/env.cpp",

fastboot/Android.bp

@@ -251,7 +251,7 @@ cc_library_host_static {
         darwin: {
             srcs: ["usb_osx.cpp"],
         },
-        linux_glibc: {
+        linux: {
             srcs: ["usb_linux.cpp"],
         },
     },