Merge "Fix some compiler warnings in vold" into main am: 1e029dce71 am: 2b156aad7d

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

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