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

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/3101798

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