Merge "vold: move some libs from shared to static" am: 39f11368 am: f4ae30da am: f042721b

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



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