...and -Werror,-Wunused-parameter

Change-Id: I8b9e0629710c3b48c26a19158ab54bb250d79d5c