Merge "Revert "Refactor HGraphBuilder and SsaBuilder to remove HLocals""