Merge "Revert "Add ART module-lib and system API to the collection"" into sc-dev