am 26e71c19: am 045f311b: Merge "Use  and  to find the tzdata."

* commit '26e71c19875e36ca4f37993bd0b40cdf2d9aee4e':
  Use $ANDROID_DATA and $ANDROID_ROOT to find the tzdata.