Merge "vold: move some libs from shared to static"