Merge "Revert "Switch sdcardfs over to bind mounts.""