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

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

Change-Id: I5697e5764208115f7bdd9e70e6322cefa2451c77