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

Change-Id: Ib0926eca84a2cfef4b6d4a7c48129d0b2510e283