Merge "Add required modules for linkerconfig"