Merge "Generate an api-versions.xml from stubs jar"