am b4157cd7: am d3d6c383: Merge "kill HAVE_LOCALTIME_R"

* commit 'b4157cd7c5d36601288a9e2a49659427d1bd7ff9':
  kill HAVE_LOCALTIME_R