I attempted to revert yonik's changes (using "svn merge -r 417265:417264 .") and then readd the requiredLibs.tar.gz and apply your 26.06.06.diff ... but even then there were 3 compilation errors in the test stemming from this missing class...
[javac] symbol : class StorageModifierStub
[javac] location: package org.apache.lucene.gdata.storage.lucenestorage
[javac] import org.apache.lucene.gdata.storage.lucenestorage.StorageModifierStub;
...perhaps the best way to proceed would be for you to submit a new clean patch against the (currently broken) HEAD ?