The below patch fixes more -Werror=format-security errors.
  Interestingly, most of the errors only showed up on our arm builds.  No
  idea why.