Merge "libutils: sp/wp: undef #defines"