[automerger skipped] Merge "Don't depend on annotation processors XmlWriter." am: e6d84c0d97 am: f4eddd99c1 am: 7b49bf18e5 -s ours
am skip reason: Change-Id I371ba32bd83d6a84de94d594169dbb5c63f3d9be with SHA-1 f5446dec1b is in history

Change-Id: Ie728ed3a5eb89e5a5f6a0431ae20d1920d408684