Merge "Use x86-specific source files only for x86 target"