patches: re-isolate patches.

- Accidently merged all of my patches in these repo's. This should
re-isolate them.

Change-Id: I1694dcb3636eb5fa734e3a5bc1580d8861e9bed6