Merge "Merge "stagefright: fix block model operations for OMX codecs" into rvc-dev am: 3e8d51cb46 am: f541ec6552" into rvc-d1-dev-plus-aosp am: dca3805ecf am: 8ff30f3b7e

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

Change-Id: Ib9f71fdf26439057503e3777fe04d73058a7479c