Merge \\\\\\\\\\\"DO NOT MERGE omx: check buffer port before using\\\\\\\\\\\" into klp-dev am: 5713902f6a am: 1410b5034f am: 8b35cb563d  -s ours am: 71676a9dc4  -s ours am: 6a2a3ed69e am: f63f606a8e am: 85b1910cf5  -s ours am: 543e6c1363 am: 7ff681b4d1 am: 33f05028bb
am: 90bdcad368  -s ours

Change-Id: I8510cb7eeee7c62176256fd68711d3676ef61b13