Merge "Require the ANDROID_TZDATA_ROOT env var"
am: f6c4aa1f67

Change-Id: Ic307cf7c3e648f37170834c1b265761de4d77b6b