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

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

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



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