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

Change-Id: Ieec09c09b01bbc9e44ff88a8a8745dd18104a936