[Modules] In case of lock timeout, fallback and build module

Duncan's r298165 introduced the PCMCache mechanism, which guarantees
that locks aren't necessary anymore for correctness but only for
performance, by avoiding building it twice when possible.

Change the logic to avoid an error but actually build the module in case
the timeout happens. Instead of an error, still emit a remark for
debugging purposes.

rdar://problem/30297862

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@298175 91177308-0d34-0410-b5e6-96231b3b80d8
(cherry picked from commit a034154895369927407fd67c361eb86eef7316ba)

 Conflicts:
	include/clang/Basic/DiagnosticCommonKinds.td
	lib/Frontend/CompilerInstance.cpp
1 file changed