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

Change-Id: I6b78fba341499617e279b38f2e1885cd58551b0d