Clean up final static to be static final

Change-Id: I3abd97e25060544ffc379048e49ebd4f102d9292
8 files changed