-Werror,-Wmismatched-tags

Change-Id: I5388bcf7228b181e429a0d82e9b0968a2ed5a06c