Merge "Add a copy of api-versions.xml in prebuilts DO NOT MERGE"