The upstream commit is somewhat big, but we're mostly interested in the change to XesamSearch::operator==(), which is necessary for fixing the build with the upcoming version of libc++ that will be committed to base. PR: 196603