Remove XML, follow refactor.

Bug: 10577809
Change-Id: Ie09bce123f678d112005347ea265338c20783e52
3 files changed