Merge "Add dependency for vold on fuse_media.o"