Merge "Allow libgtest on unbundled builds"