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

* commit '67922bb3ac780eda154b5f6201660633c56dce80':
  Work around Mac assembler differences.