am 9371c89b: am 26067c2d: Make CTS use the ddmlib-prebuilt.

Merge commit '9371c89ba117a51c4f3d256b397a67268f435588'

* commit '9371c89ba117a51c4f3d256b397a67268f435588':
  Make CTS use the ddmlib-prebuilt.