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

Change-Id: I62ebdb3da8b5c1cba67e3143e1c67a9fe7b1ec7c