Merge "Add build rule to merge annotation zips"