Your patch is already integrated in the code but there were 3 more places where I had to change sdk/tinyxml to base/tinyxml:
1 cb_share_config.cbp
2 Makefile.am
3 Makefile.im
AFAIR the Makefile.* where created just before compile process adn not part of the SVN Repo but they have to get their content from somewhere, of course.
Now I will see if it works and will report the result later.