-Werror,-Wunused-macros

Change-Id: I614e1736844637eb0a5bab3830473c36d7999426