-Werror,-Wmismatched-tags

Change-Id: Iac83316d69e85f2da3de32d8023c228f678c8f08