am a7d9920f: am f9b81ccd: (-s ours) am fcdc3141: am a35affb5: Merge "Turn on -Wformat-nonliteral."

* commit 'a7d9920f423b0bf5853884acf6a465c9ba3d0a00':