Merge "Add derive_gid flag for mounting sdcardfs" am: e3526a5ef9 am: 3b08ada8ef am: f2764d6d62
am: 92a3a52851

Change-Id: Ia95b4ce0f2d7a3c36e94dc0f4126a50604089254