Merge "Add a -testdex target for apache-xml on device"