This time use a patch to mangle the project files a bit so that
msbuild likes them.

Change-Id: I1293f4a92164ec6431b96c39f118cbdedbe5fe32