Merge "Fix the target gtest witness filename expansion in Makefile rules." am: 487ad46b7e
am: 0ce82a7d32

Change-Id: Ic34b7a889414a0dbe94c46bf81ddedf4d4d907eb