Merge "ART: Fix os << std::string* errors"