Fix up clangd after clang commit llvmorg-11-init-13375-g0a088ead85f.

It's not clear whether clangd should really consider #import to mark a
header as self-contained or not, but this change preserves the old (and
unit-tested) behavior.