Merge "Require the ANDROID_TZDATA_ROOT env var"