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

Change-Id: I4ed0d5198d2f4f892b72f4a0c8f6986355dbc1e3