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

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

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