Merge "Codec2Buffer: vstride to match height" into sc-dev am: 57571ed1 am: e15ad67a am: 2a8ba1d3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15741268

Change-Id: I7b1dec2edb9c2e17f778cce60695bfb4d3af1296