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

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