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

* commit '4ced8c12f9e18a72f120ffef58f9f427ea7b8c10':
  64-bit build fix.

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst