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

Change-Id: I404ef81298e00df590a2873cc3e932d24c77d0ce