Merge "Codec2Buffer: vstride to match height" into sc-dev am: 57571ed1a2

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

Change-Id: I13cfe57a349fb52afc7dfa7ff1cc84cee044d1e2