Merge "Fix incorrect x86 build rules."