am c2561d46: am 4ee5bd67: Merge "Avoid bus error from reading unaligned 64-bit literal"
am c2561d46: am 4ee5bd67: Merge "Avoid bus error from reading unaligned 64-bit literal"

* commit 'c2561d466266c19a74128848c419969c2c072475':
  Avoid bus error from reading unaligned 64-bit literal

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