Merge "Enable api-versions.xml generation for api-stubs"