Merge "Pass permitted_path to the linker as is." am: a214a769f9 am: f7d2b8276a
am: d05e902aaf

* commit 'd05e902aaf25bbd652f2fef760d3150dde2e062d':

Change-Id: Icdcf538d6f87db83f4820bcfe8d220aaeb72a551