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

Change-Id: Ife181e3e20461ac6da7cc20199212a3e90352a55