Merge "Revert "linker: add more directories to default lib paths"" am: 840ae69408
am: f3ee6cc97c

Change-Id: I07a8802053765f3fb914be85927e89eb029b3ff9