am 32f89821: Merge change 26044 into donut-gms

Merge commit '32f8982116e5155bc3c75c86e3c861cab1a848be' into eclair

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