Fix previous change set to properly combine multiple googletest setups.