Semi-automatically taking the the misc-include-cleaner warnings by clang-tidy and fixing files to be self-contained. Change-Id: Iaaa2b2ec9d6dcce547fa5cb6b4f056dfc8c781ff
Change-Id: I75afb65058690585bbf2671c27d6a99a87bcaab7