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 am: 2880284db0 am: c7a8f91f6c
am: b1eea21a81  -s ours

Change-Id: Ie6f9cad84edbabf92f69b04a316009016fffba5b