Merge "Merge "stagefright: fix block model operations for OMX codecs" into rvc-dev am: 3e8d51cb am: f541ec65" into rvc-d1-dev-plus-aosp am: dca3805e am: 8ff30f3b

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

Change-Id: Ib9f71fdf26439057503e3777fe04d73058a7479c