am 18363662: Merge "Updates to help classes derived from X86Mir2Lir"

* commit '183636622546ce73c8b67e586e0bc0799fe9c905':
  Updates to help classes derived from X86Mir2Lir