Update build for OpenJDK 7