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

Change-Id: I1a308ab34a49a94241bc3989f8109526a184a18f