am 91a7e878: am 81e4ab45: am 8b9a22f3: Merge "Fix the newly-introduced warning and turn on -Werror."

* commit '91a7e878f22776c8b15fb1aceb4823718611fe12':
  Fix the newly-introduced warning and turn on -Werror.