am d52484c7: (-s ours) am 38e2877d: am 67f3dd9c: Merge "logd: statistics switch to std::string"

* commit 'd52484c7aacc2154b120a5526f73c97c444509cc':