Merge "ImageReader: get correct jpeg size."