Merge "Fix the target gtest witness filename expansion in Makefile rules." am: 487ad46b am: 0ce82a7d am: c83b3d44 Change-Id: Id1f9b972499622d661ea65f833b5f40f1a950fea