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

Change-Id: I02f17bc42dced22c332bb3eb9e195a64ee0b5776