Fix static variable names

- Add some missing final qualifiers
- Removed some unused variables

Bug: 63742
Change-Id: Ib4a1ef997817026f0c2a8cb79dc5e391e210fa08
Neuter stray whitespace before semicolon

Bug: 63742
Change-Id: I89bba4b2b581ec357e33a437f11042220a6b0027