Merge "Use stride in ycbcr for YUV->YUV convert" am: 3e0b02e336 am: c45eddfc83 am: 8e94417613
am: 83bac7299d

Change-Id: I48169ff79c5891622fb1f27eeb75e3b5618589da