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

* commit '4d5fa510977d8d698ec75d128efc4e71173ae697':
  Turn 64-bit-related warnings into errors on 64-bit builds.