Accommodate libc++ upgrade and C++20 am: 2371d51bf5 am: ec5065e27e

Original change: https://android-review.googlesource.com/c/platform/external/libchrome/+/2903122

Change-Id: Iac517095a6e32756e48df6942425b021c1207b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>