Merge "Use stride in ycbcr for YUV->YUV convert"
am: 3e0b02e336

Change-Id: I6832aef1473efd54044304a9aa0b85619c46ee95