Merge "Revert "Tweak inlining heuristics.""
am: 8e00676291

* commit '8e006762917a2ee193e12c74ba24e69a5e1b9144':
  Revert "Tweak inlining heuristics."