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

* commit 'bc4b8c1845388a82435346483742757c3a52dcfa':
  Turn on -Wextra.