patches: remove stuff we can cherry pick

Change-Id: I7288215160883c222c98609f99d9ff41aa71855c