Remove redundant setup.cfg entry points

Change-Id: Iae5300308ba89b53863a24f204bbc785679f3a50
Merge "Remove redundant setup.cfg entry points"