Merge "Fix libgcov.a dependency"