Merge "Adds AID_CONTEXT_HUB" am: 19e4f2b5f3

Change-Id: I82e4975c76f332dfc7517c28807f2781991f7650