Merge "Track movement of some libcore/tzdata files" am: 2ed8b06173 am: de45dab9ed  -s ours
am: 25a9e701b0  -s ours

Change-Id: I1e835e84e9006673a3de33c117ac3a648ff57c23