am b5b7f4ba: Merge change I9899be9d into eclair

Merge commit 'b5b7f4ba9c8e5da38d023aa5b5ae61c8392c2e99' into eclair-plus-aosp

* commit 'b5b7f4ba9c8e5da38d023aa5b5ae61c8392c2e99':
  Fixing a Harmony regression in ObjectInputStream.