[automerger] bug fix: handle OMX_EventBufferFlag events am: 7409a9312d  -s ours am: 9fb681b7a1

Change-Id: I52c95d0bfda6c7129a711aefc6988944a745820e