am cf5bd8ba: Merge "logd: white and black switch to std::string"

* commit 'cf5bd8ba05a0ec3d0a15309276499a155b8aee5f':
  logd: white and black switch to std::string