Merge "Use TestCodeGeneratorX86 in codegen unit tests"
am: ba1642dec6

Change-Id: I2bdb9b704f019e035593faa7a8c66498c947c491