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

Change-Id: I31ce3e735ae68c7edc1ab7b1f61c35698d100a17