Merge "Add an env variable for the tzdata module root" am: 822dbd8911
am: 8c8d8f5df9

Change-Id: Id3d64d79c6874314ad35f26e2459fc316adf9141