Merge "stagefright: fix block model operations for OMX codecs" into rvc-dev am: 3e8d51cb am: 76a6568e am: 443f47d7 am: bb03ed59

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

Change-Id: Iabb3150ef675af886ec1d7205d8c2c59110194e5