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