Increase android32_ndk_api_level 16 -> 21

We only support 21+, so we should build for it.

Bug: 1116198
Change-Id: I552a946b245de0f54485ea985e08b53b92186bb1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367984Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804976}

build/config/android/config.gni

@@ -49,12 +49,6 @@ if (is_android || is_chromeos) {
     # not explicitly set it.
     default_min_sdk_version = 21
 
-    # Android API level for 32 bits platforms
-    android32_ndk_api_level = 16
-
-    # Android API level for 64 bits platforms
-    android64_ndk_api_level = 21
-
     # [WIP] Allows devs to achieve much faster edit-build-install cycles.
     # Currently only works for ChromeModern apks due to incremental install.
     # This needs to be in a separate declare_args as it determines some of the
@@ -62,6 +56,18 @@ if (is_android || is_chromeos) {
     android_fast_local_dev = false
   }
 
+  declare_args() {
+    # Android API level for 32 bits platforms
+    android32_ndk_api_level = default_min_sdk_version
+
+    # Android API level for 64 bits platforms
+    if (default_min_sdk_version < 21) {
+      android64_ndk_api_level = 21
+    } else {
+      android64_ndk_api_level = default_min_sdk_version
+    }
+  }
+
   if (enable_chrome_android_internal) {
     import("//clank/config.gni")
   } else {

chrome/android/static_initializers.gni

@@ -12,10 +12,16 @@ import("//build/config/sanitizers/sanitizers.gni")
 if (current_toolchain == default_toolchain &&
     (!is_debug && !using_sanitizer && proprietary_codecs)) {
   # Define expectations only for target_cpu covered by trybots.
-  # Currently static_initializers come from:
-  # * iostream.cpp
-  # * token.cc
-  if (target_cpu == "arm" || target_cpu == "arm64") {
+  if (current_cpu == "arm") {
+    # Currently static_initializers come from:
+    # * iostream.cpp std::__1::ios_base::Init::Init()
+    # * token.cc: (empty initializer list)
+    # * base_logging.cc: (empty initializer list)  (//v8/src/base/logging.cc)
+    expected_static_initializer_count = 3
+  } else if (current_cpu == "arm64") {
+    # Currently static_initializers come from:
+    # * iostream.cpp std::__1::ios_base::Init::Init()
+    # * token.cc: (empty initializer list)
     expected_static_initializer_count = 2
   }
 }