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

Change-Id: Ic743db0a2e93d0c3fb3a0ff188e2e934053244a3