am a0a74101: Adding xml-generator and updating java scanner

* commit 'a0a74101f915d1feb19384886531c6f6ee8f2f74':
  Adding xml-generator and updating java scanner