Import Cobalt 21.master.0.299983

Includes the following patches:
  https://cobalt-review.googlesource.com/c/cobalt/+/6030
    n1214.hwang@samsung.com
diff --git a/src/components/update_client/update_checker.h b/src/components/update_client/update_checker.h
index 30e4fba..9a53357 100644
--- a/src/components/update_client/update_checker.h
+++ b/src/components/update_client/update_checker.h
@@ -55,7 +55,7 @@
       scoped_refptr<Configurator> config,
       PersistedData* persistent);
 
-#if defined(OS_STARBOARD)
+#if defined(STARBOARD)
   virtual PersistedData* GetPersistedData() = 0;
 #endif