Merge "Use the ANDROID_TZDATA_ROOT environment variable"