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

Change-Id: Ia40a37f5e8fd19953a0e22c25eb8b180c288a1b4