Gross fix for duplicate definitions on krait

Change-Id: I23bae3d3dcdf119c3d4a3e82fba06ee24b6375ab