Manual merge cts-tradefed changes into master.

Change-Id: Ie9f271139e064107552543a48b719eeb2036c011
9 files changed