Merge "Move /system dependency on tz_version to bionic"

am: f5eaea32b6

Change-Id: If638121775a3d416818dca51350a65f8eb720087

README.md

@@ -193,10 +193,9 @@ build your device drivers, you shouldn't modify bionic. Instead use
 
 ## Updating tzdata
 
-This is fully automated (and these days handled by the libcore team, because
-they own icu, and that needs to be updated in sync with bionic):
-
-  1. Run update-tzdata.py in external/icu/tools/.
+This is handled by the libcore team, because they own icu, and that needs to be
+updated in sync with bionic). See
+[system/timezone/README.android](https://android.googlesource.com/platform/system/timezone/+/master/README.android).
 
 
 ## Verifying changes

libc/Android.bp

@@ -1578,7 +1578,10 @@ cc_library {
         ],
     },
 
-    required: ["tzdata"],
+    required: [
+        "tzdata",
+        "tz_version", // Version metadata for tzdata to help debugging.
+    ],
 
     // Leave the symbols in the shared library so that stack unwinders can produce
     // meaningful name resolution.