diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 3850e28d49..1992474eeb 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -43,6 +43,8 @@ if (is_android) {
 
     # Unused. Required for GN files maintained in other buildroots.
     enable_java_templates = false
+
+    android_api_level = 22
   }
 
   # Host stuff -----------------------------------------------------------------
@@ -92,9 +94,7 @@ if (is_android) {
 
   # Subdirectories inside android_ndk_root that contain the sysroot for the
   # associated platform.
-  if (current_cpu == "x64" || current_cpu == "arm64") {
-    android_api_level = 22
-  } else {
+  if (current_cpu != "x64" && current_cpu != "arm64") {
     android_api_level = 16
   }
 
diff --git a/build/secondary/third_party/vulkan_validation_layers/BUILD.gn b/build/secondary/third_party/vulkan_validation_layers/BUILD.gn
index ccd71800f0..a43a5dbf34 100644
--- a/build/secondary/third_party/vulkan_validation_layers/BUILD.gn
+++ b/build/secondary/third_party/vulkan_validation_layers/BUILD.gn
@@ -463,10 +463,12 @@ foreach(layer_info, layers) {
     }
     if (is_android) {
       libs = [
+        "c++", # Note: C++ added by Flutter.
         "log",
         "nativewindow",
       ]
-      configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
+      # Note: config edit removed by Flutter
+      # configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
     }
     defines += layer_info[3]
   }