Merge "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"" am: 7d9a5b0 am: 4082dea
am: 612ddbb

* commit '612ddbb7f40552592dba5194302554de287ef796':
  Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"

Change-Id: Ib451fad56e4267d7089ff1ca801cf35911e15ca7