new compiler bundled with java 8 is more picky on final vars

Change-Id: Iafbbd2e5478daf6743c86b26d07fcf06ae1e3986