am 512d5393: Merge "Work around Mac assembler differences."
am 512d5393: Merge "Work around Mac assembler differences."

* commit '512d5393ff0c5a4d6037cd1b9381c50ab6884eda':
  Work around Mac assembler differences.

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