Merge "Fix multilib build."