Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Support trailing slash in pathtools.Match patterns

Bug: 111389216
Test: m checkbuild
Change-Id: I3ec96d6da9d6c00c1428a8c064db9b1b60a53edd
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..89b446a
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,2 @@
+ccross@android.com
+dwillemsen@google.com