Merge "Remove mktime_tz."
am: 1464f6d8d9

* commit '1464f6d8d9d560ed57bd878b822b2611c821b8bd':
  Remove mktime_tz.