Merge "Revert "Turn on -Wformat-nonliteral.""