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

diff --cc compiler/optimizing/inliner.cc
index 33803c1,e3172df..d936a8c
--- 1/compiler/optimizing/inliner.cc
--- 2/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@@ -1073,12 -1068,11 +1073,11 @@@ bool HInliner::TryBuildAndInlineHelper(
                          resolved_method->GetDexFile(),
                          *code_item,
                          compiler_driver_,
 -                        &inline_stats,
 +                        inline_stats.get(),
                          resolved_method->GetQuickenedInfo(),
-                         dex_cache,
-                         handles_);
+                         dex_cache);
  
-   if (builder.BuildGraph() != kAnalysisSuccess) {
+   if (builder.BuildGraph(handles_) != kAnalysisSuccess) {
      VLOG(compiler) << "Method " << PrettyMethod(method_index, callee_dex_file)
                     << " could not be built, so cannot be inlined";
      return false;