Snap for 8730993 from 551a16d463d5eb8b8780abe3fa327db6f3308457 to mainline-tzdata3-release

Change-Id: Ia4cbb08cffc1238d69c487cc85105c2e1aa3c5d6
diff --git a/Android.bp b/Android.bp
index e653f3f..5b9941a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,9 +65,4 @@
     ],
 
     sdk_version: "core_current",
-    // SLF4J is used by mockftpserver, both of them are used in tests only.
-    visibility: [
-        "//external/mockftpserver",
-        "//libcore",
-    ],
 }
diff --git a/METADATA b/METADATA
index 7ae255d..9b058bb 100644
--- a/METADATA
+++ b/METADATA
@@ -1,6 +1,6 @@
 third_party {
-  license_note: "would be NOTICE save for:\n"
-  "   log4j-over-slf4j/compatibility/src/main/java/test/Log4j12Calls.java\n"
-  "   log4j-over-slf4j/compatibility/src/main/java/test/Log4j13Calls.java"
+  # would be NOTICE save for:
+  #   log4j-over-slf4j/compatibility/src/main/java/test/Log4j12Calls.java
+  #   log4j-over-slf4j/compatibility/src/main/java/test/Log4j13Calls.java
   license_type: RESTRICTED
 }
diff --git a/OWNERS b/OWNERS
index 2d36574..3176d4a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,4 @@
-# Bug component: 24949
-include platform/libcore:/OWNERS
+# This project was last update 4 years ago by ceki@qos.ch?
+# Please update this list if you find better candidates.
+jeffbailey@google.com
+rtenneti@google.com