Merge "Fix the target gtest witness filename expansion in Makefile rules."