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

Change-Id: I9a2ccebfc99ca286eda3b4892da5d2b3217a45e8