Delete OverrideLog and cleanup includes (1/2)

Test: manual; unit tests
Change-Id: Ife876333f320df1c5d7ea1b91e694928fe68b2bc
62 files changed