Merge "Switch testing configuration for md-sal tests to xml."