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

Change-Id: I5d06cdc406af437e08379dc1125d8ce682a88aae