Merge "Revert "Revert "Add derive_gid flag for mounting sdcardfs""" into oc-mr1-dev am: df77f328e7
am: 5d2ccfd850

Change-Id: Ibfc155e8e45993f7c8128b28a066ddc30dba752b