Merge "Allow the FUSE daemon access to Android/ on non-sdcardfs devices"