Merge "StartsWith/EndsWith allow std::string prefixes/suffixes now."
am: 2aa4cc4f36

Change-Id: Ief8363b68d1169b89ed8fa3f5ad6d61b8c87b2ac