Make sure that we join paths correctly.
am: 699c255805

Change-Id: I21e06ebe5ee0e9831c9d885c824a81615da909e1