Merge "stagefright: fix block model operations for OMX codecs" into rvc-dev