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

Change-Id: I234383704d430ccfd7f50d4e788d164b8b221786