am 2d603b07: Merge "ImageReader: Fix raw buffer size calculation issue"

* commit '2d603b07d43888954cd63e092ce6dd071edb433e':
  ImageReader: Fix raw buffer size calculation issue