Merge "Fix gtest soong unbundled builds"