DO NOT MERGE omx: check buffer port before using am: 0e2cc677 am: 5dd07a6e...
DO NOT MERGE omx: check buffer port before using am: 0e2cc677 am: 5dd07a6e am: beb7008c -s ours am: 9e7442d2
am: 5ab99589
Change-Id: I36b528ece7fe9bfeb76fd87082b307251c01c3fb