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

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

Change-Id: Ie55795d4b0970f5c6ab6aa4b4ff17102f468bfc7