Merge "Include pre-generated copy of api-versions DO NOT MERGE" am: d535b7207a  -s ours am: 0933a23fbf  -s ours am: 586dac76ec
am: 403253824c  -s ours

Change-Id: I8bb27f455cc74d9e3fc1df5f72266962481bd17d