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

The version of shflags we have now includes a file with an erroneous
LGPL license header even after the author relicensed under Apache2.

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: manual build
Test: treehugger

Change-Id: Ifc31394445d94248473d60b011fa76f66985e0b4
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..60ee318
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,25 @@
+//
+// Copyright (C) 2016 The Android Open Source Project
+//
+// 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
+//
+//      http://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.
+//
+
+cc_prebuilt_binary {
+    name: "shflags",
+    device_supported: false,
+    host_supported: true,
+
+    srcs: ["shflags"],
+
+    relative_install_path: "lib/shflags",
+}
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..c784bbe
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,20 @@
+name: "shFlags"
+description:
+    "shFlags is a port of the Google gflags library for Unix shell. The code is "
+    "written in a way to be as portable as possible to work across a wide array "
+    "of Unix variants. It is also tested with shUnit2 to maintain code quality."
+
+third_party {
+  url {
+    type: HOMEPAGE
+    value: "https://github.com/kward/shflags/wiki"
+  }
+  url {
+    type: GIT
+    value: "https://github.com/kward/shflags"
+  }
+  version: "7d0daf1b3b3163c34e0108cdb439e2cd2f148152"
+  last_upgrade_date { year: 2020 month: 5 day: 18 }
+  license_type: NOTICE
+}
+
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_APACHE2
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..867fee5
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,4 @@
+# This project update 3 years ago by kate.ward@forestent.com
+# Please update this list if you find better candidates.
+jeffbailey@google.com
+rtenneti@google.com