Merge "Change api-versions.xml generator source order."