Rewrite the xml for every FDO object

This will ease some pain in FLEx Bridge, when it comes
to merging some value type data properties

Change-Id: I2619975100873dc2cee4d931401ed357eef53606