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

* commit '11848f5761b66e74781686fbd272fe300bfdb557':
  Turn on -Wextra.