Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."