Merge "Revert "Add derive_gid flag for mounting sdcardfs""
am: 643e9a536c

Change-Id: Ibfe1bcd882e81e491cfc33c8077b77dc53a40de1