Merge "Remove llvm/api file matching."