Fix double escaping of senderIds in registration request.

SenderId can be either integer obtained from developer dashboard or
email. Android chrome invalidations uses email.
Fix double escaping so that registration server accepts senderId.

Review URL: https://codereview.chromium.org/148153003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247592 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 247592
Remove DataModelWrapper from android build.

BUG=none

Review URL: https://codereview.chromium.org/137723008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247593 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 247593