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

Change-Id: I67b0dfc4049f337631e12ab29330984db9edd04c