fixups for vold/FUSE in 4.4.2

Change-Id: I8614198e4ceee07087d6669e18648e2897546752