Merge "Fix multilib build warning."