-Werror,-Wmismatched-tags

Change-Id: I88207b4cf99cb21963dffeb3fe2115b0e42e70d7