Remove extraneous merge files and finish merging AppOpsManager.java