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

* commit '8b9a22f30a6cfc58f35ad5964d90319d5f3c9cd5':
  Fix the newly-introduced warning and turn on -Werror.