Fix CMAKE_ANDROID_ARCH_ABI=x86 for i686-unknown-linux-android

Author: weliveindetail

cmake/caches/Windows-aarch64.cmake

@@ -74,7 +74,7 @@ foreach(target ${LLVM_BUILTIN_TARGETS})
     elseif(${target} MATCHES armv7)
       set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI armeabi-v7a CACHE STRING "")
     elseif(${target} MATCHES i686)
-      set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI i686 CACHE STRING "")
+      set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI x86 CACHE STRING "")
     else()
       set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI x86_64 CACHE STRING "")
     endif()

cmake/caches/Windows-x86_64.cmake

@@ -74,7 +74,7 @@ foreach(target ${LLVM_BUILTIN_TARGETS})
     elseif(${target} MATCHES armv7)
       set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI armeabi-v7a CACHE STRING "")
     elseif(${target} MATCHES i686)
-      set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI i686 CACHE STRING "")
+      set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI x86 CACHE STRING "")
     else()
       set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI x86_64 CACHE STRING "")
     endif()