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

Change-Id: I7316502cc50efd08247d8f6f5a0b2ba16bbb3a48