Merge "Revert "Add derive_gid flag for mounting sdcardfs"" am: 643e9a536c am: 59f8cbb0ad am: c0da77ee3a
am: d729ab4e0f

Change-Id: Idb081c7551f0501eb072e491d5c480b971d6e69c