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 am: 01f27f5afb
am: f83f1236bc  -s ours

Change-Id: I7356073e42f9e8980334f7700e7284ba97d3eef4