Update to add variant support
Merge branch 'master' of https://github.com/google/google-api-php-client
Don't use approval prompt and prompt together

Fixes #338
Merge branch 'master' of https://github.com/google/google-api-php-client
Skip variant test for now
Merge pull request #353 from ianbarber/master

Update to add variant support