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

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