am 73698457: am 6bff8c79: Merge "Remove the use of FileInputStream.available()" into gingerbread

Merge commit '736984573a1975d69d1c6efd87e4af9ca16e505f'

* commit '736984573a1975d69d1c6efd87e4af9ca16e505f':
  Remove the use of FileInputStream.available()