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

Change-Id: I68b3dc4ee4dc8a5a0a6e8aade1e4490afbf20581