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

Change-Id: Ifdb8ed877986271a741fa8035384931a0d387904