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

Change-Id: I5bef7da59b82d7d47614f008f21c28e7c1fae92a