am 5ae762a3: Merge "Pull bionic\'s time zone data from the new single \'tzdata\' file."

* commit '5ae762a393168932602eb7269a7d30a53de1c83c':
  Pull bionic's time zone data from the new single 'tzdata' file.