am c22a27d0: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit 'c22a27d088fab0cc7fc916a649d26633f9353439':
  Revert "CTS: Fixes a possible "out of memory" exception"
  Fix for SmsManagerTest
  Add StorageManager Test
  Fix BuildVersionTest
  Add DownloadManager Test