am 824dd715: am 6ca2e817: am 3aee1be3: am 369ed988: Merge "Temporary Fix for CTS Build" into froyo

* commit '824dd7158a91b303b2503d357b690874aa2c8ea6':
  Temporary Fix for CTS Build