Merge "Switch to use tz data module tz files, not runtime module"
am: 1c5515c76a

Change-Id: I832044d65fdcb0323ae8eb2500586b12f2e7fae8