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

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