Merge "Fix RUNTIME_TARGET_GTEST_MAKE_TARGETS" am: 3f967b2565
am: 1f75648999

Change-Id: I3728b5a1dafdb4960d35f9ff2b21f82441f75dd7