Fix IActivityManager.java merge