Merge "ART: Fix os << std::string* errors"
am: 208dd6076b

Change-Id: I74d07746c3974feea218287d86d7206082ac07d0