Merge "Modify core-system-modules to include more libs"