gson v2+
Merge branch 'master' into spdy
Revert "gson v2+"

This reverts commit 14f6bfc815f0e22d4050ae56985220dcf5d6bb6f.
gson v2+