Revert "Moving StringPrintf to libbase."

libbase has been reverted

This reverts commit 7ed5fa1e4d37722a644518594bf2b0e1529c05e9.

Change-Id: I5d8ff8c38ff8c9123e6cee5dc15a101a79e94b2e
diff --git a/benchmarks/Benchmark.cpp b/benchmarks/Benchmark.cpp
index ea6000f..5ca1d47 100644
--- a/benchmarks/Benchmark.cpp
+++ b/benchmarks/Benchmark.cpp
@@ -24,7 +24,7 @@
 #include <string>
 #include <vector>
 
-#include <base/stringprintf.h>
+#include <utils/stringprintf.h>
 
 #include <benchmark/Benchmark.h>
 
@@ -108,7 +108,7 @@
 
 template <>
 std::string BenchmarkWithArg<double>::GetNameStr(double arg) {
-  return Name() + "/" + android::base::StringPrintf("%0.6f", arg);
+  return Name() + "/" + android::StringPrintf("%0.6f", arg);
 }
 
 template<typename T>