am 6892a29b: Merge "Remove more assumptions that pointers are 32-bit."

* commit '6892a29b9e63f0bb54bd402081431b1233c125aa':
  Remove more assumptions that pointers are 32-bit.