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

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