Merge "Add annotations zip, and system and module-lib APIs"