diff --git a/infra/bots/bot.py b/infra/bots/bot.py
index 7bf597a..1af530d 100644
--- a/infra/bots/bot.py
+++ b/infra/bots/bot.py
@@ -34,9 +34,6 @@
   call('sudo xcode-select -switch {xcode_app_path}'.format(
       xcode_app_path=xcode_app_path))
 
-  # Our Mac bot toolchains are too old for LSAN.
-  append('skcms/ninja/clang.lsan', 'disabled = true')
-
   call('{ninja}/ninja -C skcms -k 0'.format(ninja=ninja))
 
 elif 'linux' in sys.platform:
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index f2419d5..a9f6095 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -32,7 +32,7 @@
         {
           "name": "skia/bots/android_ndk_linux",
           "path": "ndk",
-          "version": "version:15"
+          "version": "version:16"
         },
         {
           "name": "skia/bots/clang_linux",
@@ -78,7 +78,7 @@
         {
           "name": "skia/bots/android_ndk_darwin",
           "path": "ndk",
-          "version": "version:9"
+          "version": "version:10"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
diff --git a/ninja/android.fp16 b/ninja/android.fp16
index ccd8eee..058a54a 100644
--- a/ninja/android.fp16
+++ b/ninja/android.fp16
@@ -1,3 +1,3 @@
 mode         = .fp16
-extra_cflags = -march=armv8.2a+fp16 -DSKCMS_OPT_INTO_NEON_FP16
+extra_cflags = -march=armv8.2a+fp16 -DSKCMS_OPT_INTO_NEON_FP16 -Wno-implicit-float-conversion
 include ninja/android
diff --git a/ninja/clang.lsan b/ninja/clang.lsan
index b193c48..103c409 100644
--- a/ninja/clang.lsan
+++ b/ninja/clang.lsan
@@ -2,3 +2,5 @@
 extra_cflags  = -fsanitize=leak
 extra_ldflags = -fsanitize=leak
 include ninja/clang
+
+disabled = (uname | grep -qv Linux)