Merge change I9899be9d into eclair

* changes:
  Fixing a Harmony regression in ObjectInputStream.