Remove some redundant packages that are included as deps of others

Change-Id: Id3bac8212f83504b2042f716af0a3b7929a2cd1d