Merge "Track movement of tz files into the runtime module"
am: 7eabef54ee

Change-Id: Ie3449de6eb5dcccb1b7da1e5085b02e08229db7d