MODIFY Patch type to use git-style, revert changes before patching

1) git-apply handles git diff files differently from traditional diffs,
   which is where the apply conflict was coming from
2) In order to ensure patches are applying to a clean tree, use gclient revert
   prior to syncing and applying the patches (again).
Merge pull request #6 from wobbals/android-fixes

MODIFY Patch type to use git-style, revert changes before patching