Merge changes from topic 'upgrade-expat-2.2.0'

* changes:
  Fix cast from pointer to integer of different size
  Reverted change to switch from COMPILED_FROM_DSP to WIN32
  Upgrade to expat 2.2.0