-Werror,-Wunused-macros

Change-Id: If8685cf1cfcfb25fd611e385d0b32d0b7963cd21