Merge "dist annotations.zip and api-versions.xml"