fix mac build, -Werror,-Wmismatched-tags

Change-Id: Id9396eae46c74cd701e19ff7a4f849f6cbb103bb