[Manual] Assorted fixes for CheckStyle

* Inner class constructor does not need private modifier to be hidden
* Fixed unused tags or mis-typed tags
* Move comments out from if-else body
* Add spaces between ';' and comments
* Simplified conditionals that were not fixed automatically by scripts

Bug: 63597465
Test: make checkbuild, no functional changes
Change-Id: Iaaebf4ab3840973e44dc3310d39961db89281d5e