Add spaces where required to match checkstyle.

Nowhere as spaced out as mediawiki is, maaan.

Bug: 63742
Change-Id: I84077454d90b208057f5181d45f08e01093b4539
Fix ordering of class definition modifier

Bug: 63742
Change-Id: I1a4cad03a3007633cc2dca516ee3a4044216e4d2