Merge "Add dependency for vold on fuse_media.o" am: e9c951590e am: cca6366ead

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

Change-Id: Id43b3546ef41639ba864fb2792af844eff3e6347