DO NOT MERGE omx: check buffer port before using am: 0e2cc67785 am: 5dd07a6ef3
am: beb7008c2e  -s ours

Change-Id: Ie44e05eea9e40d81de9f615422ced307282c9868