The automerger is introducing duplicate rules. Clean them
up and make sure internal master is the same as AOSP master.

Change-Id: If6183947688b2adefbc54f048958221598d8d975