Merge "Fix linker config file processing logic for O-MR1"