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

* commit '81e4ab453a43fc490205cc42d0be391495fe9686':
  Fix the newly-introduced warning and turn on -Werror.