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

Change-Id: I0681ca23658a02c5fc935afbfcc7fa798948ff09