Merge "bug fix: handle OMX_EventBufferFlag events am: 7409a9312d  -s ours am: 5f17d44600  -s ours" into oc-mr1-dev