am 5493f0b5: Merge "64-bit build fix."

* commit '5493f0b59b31453c725a32da7de3b6b60c3df713':
  64-bit build fix.