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

Change-Id: Ibfd06b4448a484aefa04f85bcd24493c040fa680