-Werror,-Wkeyword-macro

Change-Id: I4a42c9f795cfbaa0f6c7b68d8189204a63da2321