Merge pull request #228 from csoroiu/master

A bunch of small changes after gson addition (mostly android)
regenerated C++ sbeir stubs after #222 integration
Merge pull request #229 from csoroiu/master

regenerated C++ sbeir stubs after #222 integration
Merge branch 'master' into jdk6backport(android)