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

Change-Id: Ic144a897c4d6b96945cd8a4e878f5b2fed2afa4f