Merge "The localtime_tz and mktime_tz extensions are now in bionic."