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

Change-Id: I2a858e502449ace2c9c40ecb53e00dfff6d64dd8