am bffabfce: Merge "Be more flexible on the code unit size when inlining."

* commit 'bffabfce093e26bffb9e820a8f6b45474d28787a':
  Be more flexible on the code unit size when inlining.