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

Change-Id: Ie0728471e992c837a5fa5640133ef2ce282d4e10