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

Change-Id: I0ffb5948c11362bd4694076613e7d6b4dd608b3f