[ADT] Partial re-commit of r303383. Fix some Clang-tidy modernize-use-using...

[ADT] Partial re-commit of r303383. Fix some Clang-tidy modernize-use-using and Include What You Use warnings; other minor fixes (NFC).

llvm-svn: 305419