am fcdc3141: am a35affb5: Merge "Turn on -Wformat-nonliteral."

* commit 'fcdc3141d3209afb8a8a62764fa66911a7104e74':
  Turn on -Wformat-nonliteral.