am 50a683c6: am 0da7a26e: Merge "Fix codegen_test."

* commit '50a683c6352c6ff040e88e331027e6e72e73b74d':
  Fix codegen_test.