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

Change-Id: I03298b52f637eca7b33d1a5fd5c4c9ed4f58276e