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

Change-Id: Ice11a3316f0afac256a9c4b3ec8f4cc78a345dc4