Merge "C2SoftMpeg4Enc: Handle yStride not equal to aligned width" am: 1b4180698c am: e349c1ee9e
am: a9f528b0f0

Change-Id: I12f4b84909027bf81c266ee5c37f9f1a661f5533