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

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

Change-Id: I163effdc3b680779da90456cbfcb439ec8f66863