nfc: Remove defined(MACRO) and define undefined macros
am: 7148a105a8

Change-Id: Ic3f52e0a0f2cdf50c72b0035d3770bf956548345