Merge "Enable api-versions.xml generation for api-stubs" into stage-aosp-master