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