Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev am: 6746aa8c4d
am: 3471981ddc

Change-Id: I1d308a6ef5ad479c152b8db1264842caefc36295