Merge "Fix --inline-max-code-units option." am: bf14c65108
am: 57222d44bc

* commit '57222d44bc4b02e258eb3958b5ad18ff36b28978':
  Fix --inline-max-code-units option.