am 6f502bc7: Merge "Add more __restricts, clean up __format__ attributes."

* commit '6f502bc74374804766639e6b1515644875810bda':
  Add more __restricts, clean up __format__ attributes.