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: 7f2b11d1e3
am: e1d0655668

Change-Id: Iecaa94b6eefcb3749dc7c34e327bf0124f295008