Merge "Migrate to the new clang lib dir"