am 94cba829: am 67922bb3: am 512d5393: Merge "Work around Mac assembler differences."

* commit '94cba829d6d21eecc3468c0bbe5cc2171405636a':
  Work around Mac assembler differences.