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

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

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