am 0afc1cb4: Merge "Fix 64-bit build"
am 0afc1cb4: Merge "Fix 64-bit build"

* commit '0afc1cb469a07d47e64bb11b8b624bd99f6acf72':
  Fix 64-bit build

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