Merge "Revert "Remove old FUSE bypass now that we have sdcardfs."" into nyc-dev