Merge "Better, consistent definition of AID_SHARED_GID." am: 7e875df695
am: 42064a3aa2

Change-Id: I85979f6f70bbef34d6041495310b442cb0405d2d