Merge "Include pre-generated copy of api-versions DO NOT MERGE"
am: d535b7207a  -s ours

Change-Id: Ida0ad52aea6b5df8bf8590e23bacab9878787864