am bf9f3ea7: Merge 34afc2cd from gingerbread-plus-aosp

* commit 'bf9f3ea72ea3201415acb3bb016de3009d3ed1b3':
  API: Make close() throw an IOException.