Merge "Revert "Base: Delete ostream<< with std::string*"" am: 7178e29c22 am: 3578488787
am: 29769551c0

Change-Id: I64a35d031068bc1e8f631cf19300f9694e5a240b