Merge "Revert "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""" am: 8913162
am: 9eff981

* commit '9eff98156ec2924c47bf816650a8ee127f74502f':
  Revert "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""

Change-Id: Idc9951c9ae6463c75662a553c3848ef66d64184d