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

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