Merge "Add derive_gid flag for mounting sdcardfs" into oc-mr1-dev