Removing unneeded patch

A version of this patch has now been merged upstream.

Change-Id: I35e5cea81739f8270fa4116848c60b6dff1356f2
Merge "Removing unneeded patch"