Merge "Track movement of some libcore/tzdata files"
am: 6794bc7d37

Change-Id: Iaadcef18ac75de0f6d31485d7c9fdd555bc0e6b0