Merge "bug fix: handle OMX_EventBufferFlag events" into oc-mr1-dev am: 35adbc2a4d
am: b9ddad3e8a  -s ours

Change-Id: I7f8df3ef982c76c2ac8bba35179dbcf15b715c04