Merge "Add systemapi version of api-versions.xml and annotations.zip to dist."