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

Change-Id: I87d035cb682af9f5396896a7ae8f84844dec6ee3