am 8b20d5b9: Merge "Turn 64-bit-related warnings into errors on 64-bit builds."

* commit '8b20d5b97e98ddac6031cb555078f425aef1da8f':
  Turn 64-bit-related warnings into errors on 64-bit builds.