Merge "Add derive_gid flag for mounting sdcardfs" into oc-mr1-dev
am: 47c5929bb5

Change-Id: Iaae0c0db2d17a402462cfebf07d6d55840a580f1