Stop defining local "unused" macros now this is C++.

Bug: N/A
Test: builds, boots
Change-Id: I3eb075d5003fa7cdc6690f4af29a296e22be257c
6 files changed