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

Change-Id: I5223fe1a394f15b60e0abad4c2dd5fa8902ef9bc