Round 1 of cts-tradefed XML tweaks.

Bug 5264339

Change-Id: I8e4cd92cced94c7ff3be106b04923b47f0345d8e
9 files changed