Merge "Modify cts-tradefed xml generator to match current schema." into honeycomb