Update Android to r23b image (#64567)

* Update Android to r23b image

* Don't use flag unavailable in r23b

eng/pipelines/common/platform-matrix.yml

@@ -372,7 +372,7 @@ jobs:
       targetRid: android-x64
       platform: Android_x64
       container:
-        image: ubuntu-18.04-android-20200422191843-e2c3f83
+        image: ubuntu-18.04-android-20220131172314-3983b4e
         registry: mcr
       jobParameters:
         runtimeFlavor: mono
@@ -396,7 +396,7 @@ jobs:
       targetRid: android-x86
       platform: Android_x86
       container:
-        image: ubuntu-18.04-android-20200422191843-e2c3f83
+        image: ubuntu-18.04-android-20220131172314-3983b4e
         registry: mcr
       jobParameters:
         runtimeFlavor: mono
@@ -420,7 +420,7 @@ jobs:
       targetRid: android-arm
       platform: Android_arm
       container:
-        image: ubuntu-18.04-android-20200422191843-e2c3f83
+        image: ubuntu-18.04-android-20220131172314-3983b4e
         registry: mcr
       jobParameters:
         runtimeFlavor: mono
@@ -444,7 +444,7 @@ jobs:
       targetRid: android-arm64
       platform: Android_arm64
       container:
-        image: ubuntu-18.04-android-20200422191843-e2c3f83
+        image: ubuntu-18.04-android-20220131172314-3983b4e
         registry: mcr
       jobParameters:
         runtimeFlavor: mono

src/tasks/AndroidAppBuilder/Templates/CMakeLists-android.txt

@@ -4,16 +4,6 @@ project(monodroid)
 
 enable_language(C ASM)
 
-if(NOT USE_LLVM)
-    # the assembler code we generate is GNU which isn't understood by llvm
-    add_compile_options(-no-integrated-as)
-endif()
-
-# Prevent the warning: shared library text segment is not shareable which is treated as an error
-if (NOT ANDROID_ABI STREQUAL "arm64-v8a")
-    add_link_options(-Wl,--no-warn-shared-textrel)
-endif()
-
 add_library(
     monodroid
     SHARED