Merge "Fix --inline-max-code-units option."