am 11a06c73: Merge "Revert "Moving StringPrintf to libbase.""

* commit '11a06c73f6e7d31442429a58a346d881b0a8a441':
  Revert "Moving StringPrintf to libbase."