Remove patches that aren't applicable on master.

Change-Id: Ia1829637824ca1b18cf12739a9e4d12267e22699