Merge "Require the ANDROID_TZDATA_ROOT env var" am: f6c4aa1f67 am: 20fd6bdc01
am: 1f36ba9bef

Change-Id: I57438a71f9de6d18cc94734437af723c8747f4e3