Merge "Add a copy of api-versions.xml in prebuilts DO NOT MERGE"
am: db7c2bfa6a  -s ours

Change-Id: Ic8569e019bed71e4c19fc2d121e714275ece59d6