am 06e5b766: am 0167263b: Merge change Ide90d0cc into eclair

Merge commit '06e5b76667f02e4e45b2689d56d7d0596b4ef477'

* commit '06e5b76667f02e4e45b2689d56d7d0596b4ef477':
  Unify Java NIO to read/write MiniThumbFile.