am 9dd0914a: Merge "Turn on -Wextra."

* commit '9dd0914ac96e77a725c696dd557d56528316e8de':
  Turn on -Wextra.