am b64224c2: am 68bc6d3a: Merge "Work-around 64bit build issues."

* commit 'b64224c24146014af3bda6a8b8c6ef0ec5781845':
  Work-around 64bit build issues.