Merge "Cherry-pick "Use appropriate options in SkJpegCodec readRows()""