am 82a6e83b: Merge "CTS Coverage Build Improvements" into froyo

* commit '82a6e83bfb791df25e6f165554fcae12225c76c1':
  CTS Coverage Build Improvements