DO NOT MERGE omx: check buffer port before using am: 719fd3c062  -s ours
am: 924aa78614

Change-Id: I1c1c4f0a72d626a6aa035601b5d3948cedb814ee