am 94ead767: Merge "Quick: Clean up Mir2Lir codegen."

* commit '94ead7673f90a8199d926fe161d7d021202f0aa7':
  Quick: Clean up Mir2Lir codegen.