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

Change-Id: I57d45557c585238f9e98e0bf81c06058235d7e74