diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index f4833086736..faaad0c20d2 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -114,23 +114,32 @@ cc_library {
                 "trace-dev.c",
                 "uevent.cpp",
             ],
-            sanitize: {
-                misc_undefined: ["integer"],
-            },
         },
 
         android_arm: {
             srcs: ["arch-arm/memset32.S"],
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
         },
         android_arm64: {
             srcs: ["arch-arm64/android_memset.S"],
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
         },
 
         android_mips: {
             srcs: ["arch-mips/android_memset.c"],
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
         },
         android_mips64: {
             srcs: ["arch-mips/android_memset.c"],
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
         },
 
         android_x86: {
@@ -138,6 +147,12 @@ cc_library {
                 "arch-x86/android_memset16.S",
                 "arch-x86/android_memset32.S",
             ],
+            // TODO: This is to work around b/29412086.
+            // Remove once __mulodi4 is available and move the "sanitize" block
+            // to the android target.
+            sanitize: {
+                misc_undefined: [],
+            },
         },
 
         android_x86_64: {
@@ -145,6 +160,9 @@ cc_library {
                 "arch-x86_64/android_memset16.S",
                 "arch-x86_64/android_memset32.S",
             ],
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
         },
     },