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

* commit '7cf399e775a7d5bd28cbbef978ab0faa0b6e88b4':
  Fix WifiInfoTest
  Update NO_DELIVERY_REPORTS list.
  Update Expectations File
  Remove Test Annotation Related Tools
  Clean Up VideoViewTest
  CTS: Fixes a possible "out of memory" exception