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

Change-Id: Ieb5e88cba216cf66f5f3e9ae9c92aea314b8e70e