[automerger skipped] Merge "Add a host simulation of the tzdata module" am:...
[automerger skipped] Merge "Add a host simulation of the tzdata module" am: 69324709 am: 106a3210 -s ours
am: 2ff485ac -s ours
am skip reason: change_id I43dadb150e359bbcb9da61e0187286ac6d38f7c2 with SHA1 82367025 is in history
Change-Id: I8509f4840ae759dea99e170f9e879b3125adc58c