drop unneeded patches

Change-Id: I67314a12717ada0bdb49d9578821abf66fb41302