[automerger skipped] Merge "Enable api-versions.xml generation for api-stubs" am: 7cba8a7f -s ours am: 99cf8bca -s ours Change-Id: I02b310d79c840fd4ba5447d4679971f2aa7317ac