Merge \\\"DO NOT MERGE omx: check buffer port before using\\\" into klp-dev am: 5713902f6a am: 1410b5034f
am: 8b35cb563d  -s ours

Change-Id: I40733cfbad5dac51eceb5e09ad3cad4688bea63e