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

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