Merge "Revert "Add derive_gid flag for mounting sdcardfs""