Merge "Use stride in ycbcr for YUV->YUV convert"