Merge "Fix include in YuvToJpegEncoder"