Merge "ActivityManagerService: fix nativehelper includes" am: c372715beb  -s ours am: 4d28662818  -s ours
am: b6c4ccb724  -s ours

Change-Id: I451558f083495ff80b44f41f66fd18f1cbe1a6fe