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

* commit '9f686c996bb45f0d377342fadfd20f5ae7a640de':
  Add cts-tradefed to cts build.