Merge "Fixes for YuvToJpegEncoder::encode"