Merge \\\\\\\\\\\\\"DO NOT MERGE omx: check buffer port before...

Merge \\\\\\\\\\\\\"DO NOT MERGE omx: check buffer port before using\\\\\\\\\\\\\" into klp-dev am: 5713902f am: 1410b503 am: 8b35cb56  -s ours am: 71676a9d  -s ours am: 6a2a3ed6 am: f63f606a am: 85b1910c  -s ours am: 543e6c13 am: 7ff681b4 am: 33f05028 am: 90bdcad3  -s ours am: 3b030055
am: f2b3da79

Change-Id: I6e29d9e8b1b8d3dc7d8653994f38e3596766a941