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

Change-Id: Ib1adcc0172f1f5959bb4e44da2740693f0a8f18d