Merge "Don't depend on annotation processors XmlWriter."
am: e6d84c0d97

Change-Id: If65b250fedc4020323e9eb7110c9e9ebe25f4c89