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

Change-Id: Icf0c899eeed94881781dced89ec5c922460180d3