am 3238cc2a: am 32f89821: Merge change 26044 into donut-gms

Merge commit '3238cc2a901ed6e0e3bb11fa601913c2ed09ddb7' into eclair-mr2

* commit '3238cc2a901ed6e0e3bb11fa601913c2ed09ddb7':
  Remove tests.api.java.io.FileTest#test_delete as known failure.