Corrected problems that prevented building (app-engine-sdk was in test
scope only)