am 0c1b297d: Merge "Use $ for f registers to please clang."

* commit '0c1b297d586b71970da17c77774c27a6603118f6':
  Use $ for f registers to please clang.