cleanup: correct typos and fix some warnings

Test: make
Change-Id: I33e4872bd91c023dd1268ad8e2972c6096348979
(cherry picked from commit f28eede4989199d41ec780147cd50d166ab7793b)
11 files changed