am f4b34b6c: (-s ours) DO NOT MERGE Revert "Add the libcutils localtime_tz and...
am f4b34b6c: (-s ours) DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
* commit 'f4b34b6c':
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."