Merge "Check setegid() return values" am: 0d24c8f852 am: fb13dab611
am: 5de0f0ea41

Change-Id: Id04b1cddd4baa137527dd2d50189f01a89a2f646