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

Change-Id: Ifad7e44a21aeebdeaab3b31c93ece145f86a1cb9