Revert Add CM tinyXml

Change-Id: If7662dc9330f2c8085475e861c5604527141ad5e (reverted from commit 9c3863ced60a2c5817a546116d0ad4e6f09403ea)