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

Change-Id: I6538ad0396fdfa6058a1c5bb6fd9ed74e2382f5b