am 69cf921f: Merge "Fix a few 64-bit compilation of 32-bit code issues."

* commit '69cf921f5ab4467fa2c109e30ea5caca2a20790c':
  Fix a few 64-bit compilation of 32-bit code issues.