Merge "Tweak inlining heuristics." am: ff6ab45547
am: a2ade148e3

* commit 'a2ade148e34988b19b0e3f5d166c9f71be6e7f47':
  Tweak inlining heuristics.