Merge "Tweak inlining heuristics."
am: ff6ab45547

* commit 'ff6ab45547a629b1e237a1bf4b8530a5c99377e5':
  Tweak inlining heuristics.