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

Change-Id: I2e1d639da9c13142125fa3b62551e6b0e2f8926a