Merge "input: sensor: stk3x1x driver code cleanup"