Apply caqti patch

[dkijania]

Since Berkeley is safety out, we can merge caqti update to our codebase and do not keep it as patch .

In this PR i also fixed toolchain issue which didn't build focal and GIT LFS was also making some trouble