Merge "linker: Fix fd leak" am: 5c722edf2b
am: f05568a018

Change-Id: Ia4aaf8f6f83f7ad5586926f68c15d8e5103b66ee