Merge "Use the ANDROID_TZDATA_ROOT environment variable" am: 11f0d71836
am: b968a4a842

Change-Id: Id2148fdb6ab36c8996a8aca567cf928c4d80a9cc