am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."

* commit 'ec0472ba9c1cfaee293636536f3951c0e6e671b4':
  Move AString's StringPrintf out of the way.