Merge "Add ART's module-lib to "module_current"" into sc-dev