Merge "stagefright: fix block model operations for OMX codecs" into rvc-dev am: 3e8d51cb46 am: 76a6568eff

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

Change-Id: Ie99af18a629f7f4cd4de5ff3ca14409dc97b02e0