Merge "Make building an empty static library work."