am 98c2591a: (-s ours) merge from open-source froyo

Merge commit '98c2591a3de16682c957edc0d4fd3d10aacb3cb9' into gingerbread

* commit '98c2591a3de16682c957edc0d4fd3d10aacb3cb9':
  Add/Remove Some @KnownFailure Annotations