Import Cobalt 21.master.0.267507

Includes the following patches:
  https://cobalt-review.googlesource.com/c/cobalt/+/5630
    by devin.cai@mediatek.com
  https://cobalt-review.googlesource.com/c/cobalt/+/5710
    by p.mirgos@samsung.com
  https://cobalt-review.googlesource.com/c/cobalt/+/5730
    by lizhi.fan@samsung.com
diff --git a/src/starboard/nplb/sabi/signedness_of_char_test.cc b/src/starboard/nplb/sabi/signedness_of_char_test.cc
index b736e08..97ffe23 100644
--- a/src/starboard/nplb/sabi/signedness_of_char_test.cc
+++ b/src/starboard/nplb/sabi/signedness_of_char_test.cc
@@ -14,7 +14,7 @@
 
 #include "starboard/configuration.h"
 
-#if SB_API_VERSION >= SB_SABI_FILE_VERSION
+#if SB_API_VERSION >= 12
 
 namespace starboard {
 namespace sabi {
@@ -27,4 +27,4 @@
 }  // namespace sabi
 }  // namespace starboard
 
-#endif  // SB_API_VERSION >= SB_SABI_FILE_VERSION
+#endif  // SB_API_VERSION >= 12