Code cleanup.

Test: mm -j8
Change-Id: I269111becf3a4f3de74b2835be1238c24717a311
4 files changed