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

Change-Id: I01625564f33e8ea5d10af78869dadfa67d3ed6ed