Merge "Make IActivityManager.killPids asynchronized" into sc-dev