Merge "Fix lint library project configuration handling"