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

Change-Id: I60a2fc607dcde8fb997fb930c18ea10d53c622c5