--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -250,7 +250,7 @@
     ssimulacra2.cc
     ../third_party/dirent.cc
   )
-  target_link_libraries(benchmark_xl Threads::Threads)
+  target_link_libraries(benchmark_xl Threads::Threads -landroid-glob -landroid-spawn)
   target_link_libraries(benchmark_xl jxl_gauss_blur) # for ssimulacra
   if(MINGW)
   # MINGW doesn't support glob.h.
--- a/third_party/sjpeg/CMakeLists.txt
+++ b/third_party/sjpeg/CMakeLists.txt
@@ -44,20 +44,7 @@
 ################################################################################
 # Android only.
 
-if(ANDROID)
-  include_directories(${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures)
-  add_library(cpufeatures-sjpeg
-    STATIC ${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures/cpu-features.c
-  )
-  target_link_libraries(cpufeatures-sjpeg dl)
-  set(SJPEG_DEP_LIBRARIES ${SJPEG_DEP_LIBRARIES} cpufeatures-sjpeg)
-  set(SJPEG_DEP_INCLUDE_DIRS ${SJPEG_DEP_INCLUDE_DIRS}
-      ${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures
-  )
-endif()
-
 ## Check for SIMD extensions.
-include(${CMAKE_CURRENT_LIST_DIR}/cmake/cpu.cmake)
 
 ################################################################################
 # sjpeg source files.