Merge "ActivityManagerService: fix nativehelper includes"