Massive update from internal, and merge gsutil code.

This finishes the merge of the internal and gsutil branches of apitools. Phew.
29 files changed