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

* commit '1ce139b2ce9df43557a9e9dcb4d4b09e97e81e94':
  Turn on -Wformat-nonliteral.