Merge "Better, consistent definition of AID_SHARED_GID." am: b77ecd04d8
am: ea41bcf7a3

Change-Id: I7a75c46a1d40db8d2ef1b91234db38b5e1cfe994