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

* commit '55c0f49cf185a9457acd32d6e5f3a79900983702':
  Revert "Tweak inlining heuristics."