Merge "More consistent host library path in multilib build."