Merge "more fixes to solve library location path. Turns out the slashes weren't in the right places. Following ag/2143196"