Snap for 8310672 from 34be9e4b0e1f3e40dad6a8d4cd2c5ac99df503bc to udc-release

Change-Id: I41d86cd376911f284c4e74cfa9315ea2c40ad390

Android.bp

diff --git a/Android.bp b/Android.bp
index 0289573..b13d7e4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -114,10 +114,17 @@
         linux_glibc_x86: {
             enabled: false,
         },
+        linux_musl_x86: {
+            enabled: false,
+        },
         linux_glibc_x86_64: {
             local_include_dirs: ["linux_x86_64/pyconfig"],
             cflags: ["-Werror"],
         },
+        linux_musl_x86_64: {
+            local_include_dirs: ["linux_x86_64/pyconfig"],
+            cflags: ["-Werror"],
+        },
         windows: {
             enabled: false,
         },
@@ -976,13 +983,7 @@
                 "Modules/_ctypes/libffi/src/x86/darwin64.S",
             ],
         },
-        linux_bionic: {
-            local_include_dirs: ["linux_x86_64/libffi"],
-            srcs: [
-                "Modules/_ctypes/libffi/src/x86/unix64.S",
-            ],
-        },
-        linux_glibc_x86_64: {
+        host_linux: {
             local_include_dirs: ["linux_x86_64/libffi"],
             srcs: [
                 "Modules/_ctypes/libffi/src/x86/unix64.S",