Merge pull request #10016 from mrcmunir/android-x86_64

Fix #9814 android x86-64 cmake problem.

CMakeLists.txt

@@ -1614,7 +1614,7 @@ add_library(${CoreLibName} ${CoreLinkType}
 if(ANDROID)
   set(CoreExtraLibs ${CoreExtraLibs} android)
   if(X86_64)
-    set(CoreExtraLibs -Wl,--gc-sections -Wl,--exclude-libs,ALL)
+    set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
   endif()
 endif()	
  

android/build.gradle

@@ -58,8 +58,7 @@ android {
 			versionName ANDROID_VERSION_NAME
 		}
 		ndk {
-			abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86'
-			// Disabled 'x86_64' due to reported crash issues I can't debug without a device.
+			abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
 		}
 		signingConfig signingConfigs.debug
 	}