fixed import error for apiclient discovery
fixed import errors on test code
Merge pull request #1621 from AppScale/import-error-2

GCE import error