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

Change-Id: I55f7897bd8c312abc1fe6528560b3706c0e3ee78