am 9e4dca52: Merge "Switch cts-tradefed to use the tf console." into honeycomb

* commit '9e4dca528d2c90591b6a3690edceac29d3628dc9':
  Switch cts-tradefed to use the tf console.