Fix SDK build on JDK8