Add the install name dir logic

Change-Id: Ief11fbb73ab035944e03ccd51dd2074c5e949836
Merge branch 'install-dirs'

Change-Id: Ibf52eced52ff523994bd7e74df4ac82e362798e5