Merge "Revert "Migrate to the new clang lib dir""