Revert Klocwork fixes on non-Intel codes

Revert Klocwork fixes on non-Intel codes

BZ: 23909

Klocwork fixes were commited for non-Intel codes by mistake.  Revert the fix per Kernel Team request.

Change-Id: Idddf1bd7adf45f6a0d48d3fc7fa5114059a355ff
Signed-off-by: Cheon-Woei Ng <cheon-woei.ng@intel.com>
Reviewed-on: http://android.intel.com:8080/42609
Reviewed-by: Saripalli, Ramakrishna <ramakrishna.saripalli@intel.com>
Reviewed-by: Yang, Fei <fei.yang@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>