[automerger skipped] Merge "Enable api-versions.xml generation for api-stubs"
am: 7cba8a7fe4  -s ours

Change-Id: Iea451945b8e48b5819dd1faff2e50d8af61ab2ef