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

Change-Id: Ied46eb7dd9ea5fbccbb995d531d2d5b34f51d0ad