Merge "Fix multilib build"