Add support for ANDROID_TZDATA_ROOT am: 26a5dd6fd1
am: e46336181c

Change-Id: Ia7624f0700976f08aed3814fb7e638db0e23350a