merge ActivityManagerService & remove unused files