Merge "Fix lint column offset handling, and add columns to API check"