Merge "Track movement of some libcore/tzdata files am: 3b5ae1e60f" into oc-dr1-dev-plus-aosp
am: 8e81a7c8d5

Change-Id: I6a32c9fc62850f469f56aabc037f57219ba7de38