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

Change-Id: I323c236e4808b6e40d209225f8f15effb42a6a90