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

Change-Id: Ia7b9d4254d6570baf53a72c11fc42e493efda1c5