am d4805af6: Merge "use BufferedInputStream in readTextFile" into jb-mr1-dev

* commit 'd4805af6163b6873abbf628f6672a2188e24ef3c':
  use BufferedInputStream in readTextFile