-Werror,-Wunused-macros

Change-Id: I04b79678a488d6dd954a339f678d56f978249b32