Merge "Codec2Buffer: vstride to match height" into sc-dev am: 57571ed1 am: 1d493b01 am: 3c046b33 am: 4be34113

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

Change-Id: I9a9c880333711207d417f792916dca63d85b3f52