Merge "Fix build with ToT libc++" into main am: e2a656fd66

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3101379

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