Rebase android-json.


git-svn-id: http://google-web-toolkit.googlecode.com/svn/tools@11677 8db76d5a-ed1c-0410-87a9-c151d255dfc7
Merge remote-tracking branch 'origin/upstream'

Change-Id: Iadaf218db7c771fd688f946c14609b99e571405e