This is to request approval to backport 8027351 to 7u60. https://bugs.openjdk.java.net/browse/JDK-8027351
Other than the makefile change, the patch is straight backport from JDK 8 changeset [1].
Webrev at: http://cr.openjdk.java.net/~mchung/jdk7u/webrevs/8027351/webrev.00/ The build and tests are verified on all platforms. Mandy [1] http://hg.openjdk.java.net/jdk8/jdk8/jdk/rev/41d7ce111bd8