Merge "Add apache-xml to boot class path for tests." am: 570886357e
am: c6175664b3

Change-Id: Ic748a9ee61aff79a966175390a9dca84b9d69bd1