am 3aee1be3: am 369ed988: Merge "Temporary Fix for CTS Build" into froyo

* commit '3aee1be35cb3dcb2677faaebe4b4cb139c87433b':
  Temporary Fix for CTS Build