Merge "Move IActivityManager to aidl."