am 4a7001ca: Merge "Work around C11 const atomic restrictions."

* commit '4a7001cae482e3c9410001360374c8fe9d5a2846':
  Work around C11 const atomic restrictions.