Merge "Revert "Revert "Tweak inlining heuristics."""