Merge branch 'master' into release

Change-Id: I6e5c45cffa1cae932ca1e7294f3b6ef1be26b8ee

script/handle_master.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+./oss.py --google3-filter --proto-lite-runtime ..

script/handle_oss.sh

@@ -18,3 +18,5 @@
 ./oss.py --all --no-subst --fix-oss-headers .
 ./oss.py --all --google3-filter --no-subst --fix-oss-headers --no-recurse ..
 ./oss.py --google3-filter --fix-oss-headers --proto-lite-runtime ..
+cd ..
+/google/bin/releases/opensource/thirdparty/cross/cross .

script/oss.py

@@ -103,6 +103,7 @@ def post_process_oss_files(path, args):
   else:
     top_dirs = ["cpp", "proto"]
   transforms = (
+    ("::google3_proto_compat::MessageLite", "::google::protobuf::MessageLite"),
     ("third_party/webrtc/files/stable/", ""),
     ("webrtc/files/stable/", ""),
     ("third_party/", ""),