Merge "Add derive_gid flag for mounting sdcardfs"
am: e3526a5ef9

Change-Id: I3543e1eb46866ed9b11a6d2d133de8edbf76cb2c