Fix Java 8 compatibility

Building the project using Java 8 fails due to method visibility
issues. Apparently something changed from Java 7 regarding those rules.

Change-Id: Ic28c9638636bd29bb0f6688733c83d9808bb5b4c