am fb230df7: am 05281c8d: Merge "More CTS Coverage Build Improvements" into froyo

* commit 'fb230df7b18fd662e9ff3696dfecb14c1df8fa09':
  More CTS Coverage Build Improvements