am 2aad7a5b: Merge "Add cts-tradefed to cts build." into honeycomb

* commit '2aad7a5beae2b308332270c27645f45674303a77':
  Add cts-tradefed to cts build.