remove unnecessary patches

They have been applied upstream and are part of the new release.

Change-Id: I928b29e74abe2415bdf75de32cbaa7ac279a2889