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

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



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