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

Change-Id: I3ac3071c0d59c809b37b7abf3393899dee6380bd