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

* commit '7c6f0e3546a6466fb9e1c05589eea9141642e055':
  Use $ for f registers to please clang.