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

Change-Id: I5ecbf03a48eb9b50cfc06bfdbf86b20d7024e9aa