hg: build-infra/jdk9/jdk: Previous fix was almost but not entirely correct.

[magnus.ihse.bursie at oracle.com]

Changeset: 5dfed85c0e6d
Author:    ihse
Date:      2015-11-10 17:34 +0100
URL:       http://hg.openjdk.java.net/build-infra/jdk9/jdk/rev/5dfed85c0e6d

Previous fix was almost but not entirely correct.

! make/lib/Awt2dLibraries.gmk
! make/lib/Lib-java.instrument.gmk