Merge "Fix RUNTIME_TARGET_GTEST_MAKE_TARGETS"
am: 3f967b2565

Change-Id: If3ca090e393f2895f8ce42249028010107075b58