hg: jdk/jdk: 2 new changesets

[alan.bateman at oracle.com]

Changeset: f1e1a4fc1cc7
Author:    alanb
Date:      2017-12-14 12:36 +0000
URL:       http://hg.openjdk.java.net/jdk/jdk/rev/f1e1a4fc1cc7

8193503: javah launcher was not removed by JDK-8191054
Reviewed-by: erikj, darcy

! make/launcher/Launcher-jdk.compiler.gmk
! test/jdk/tools/launcher/ToolsOpts.java

Changeset: 267be02c1137
Author:    alanb
Date:      2017-12-14 12:51 +0000
URL:       http://hg.openjdk.java.net/jdk/jdk/rev/267be02c1137

Merge