Merge "Track movement of some libcore/tzdata files" am: 6794bc7d37
am: e4950aba1a  -s ours

Change-Id: I6714ac946001813cc805491827c228697ced543a