Remove redundant GroupOverride entries

They are already defined in GroupOverrides2.

Change-Id: Id057d32a33cf1bd69708519a6d3416a644bfd93a