Add support for ANDROID_TZDATA_ROOT am: 26a5dd6fd1 am: e46336181c
am: 5d36318ffe

Change-Id: I69d7d089beac90e236ae0336cd70632aa672c2f1