DO NOT MERGE omx: check buffer port before using am: 0e2cc67785 am: 5dd07a6ef3 am: beb7008c2e  -s ours am: 9e7442d243 am: 5ab9958989 am: e57fe76dac
am: 9d81965dca  -s ours

Change-Id: Ie06d843cb2516df0dcff9486ec2d4769c2f77ab8