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

Change-Id: Ifb3e2896dad1586e36f7777ad16d6a6d15fa12eb