Merge changes If69f69bf,I941b3c89

* changes:
  Add back missing `tidy_checks`, since `tidy_checks_as_errors` isn't enough
  Use `tidy_checks_as_errors` list instead of `-warnings-as-errors=*`

cmds/idmap2/Android.bp

@@ -23,9 +23,16 @@ cc_defaults {
         "misc-*",
         "readability-*",
     ],
+    tidy_checks_as_errors: [
+        "modernize-*",
+        "-modernize-avoid-c-arrays",
+        "-modernize-use-trailing-return-type",
+        "android-*",
+        "misc-*",
+        "readability-*",
+    ],
     tidy_flags: [
         "-system-headers",
-        "-warnings-as-errors=*,-bugprone*",
     ],
 }