Merge "attempt to fix google_tests.mk with magic"