Fix openjdk7 (new bootstraps)