Merge "OpenJdkJVM: Fix Mac OS build."