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

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

Change-Id: Ib027ac7dec02c175d50192f6b1ad15ed2fb19a28