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

* commit '00599eca7446f28762da3854566cff0b2ba46799':
  Revert "Turn on -Wformat-nonliteral."