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

* commit '4082deab827eb5c6cd4b8c6d10d494949d209a4f':
  Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals"

Change-Id: Ifd13e4161873261b01aceb16321f72db0d315fa8