Merge "Fix linker config file processing logic for O-MR1"
am: 0830f5b769

Change-Id: I66ed76ed0b2683f9414a259d484ad25ee7b3cb59