Merge "Use TestCodeGeneratorX86 in codegen unit tests"