am 01c48dce: am 00599eca: am e84205bf: Merge "Revert "Turn on -Wformat-nonliteral.""

* commit '01c48dceba50bcdc4cf313217b4d79dabb6721fe':
  Revert "Turn on -Wformat-nonliteral."