hg: jdk9/sandbox: 8148416: Fix merge error in hotspot.m4 introduced in Merge changeset 8b46c6cecc37

[chris.hegarty at oracle.com]

Changeset: 8f6de5564fba
Author:    ihse
Date:      2016-01-28 07:59 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/rev/8f6de5564fba

8148416: Fix merge error in hotspot.m4 introduced in Merge changeset 8b46c6cecc37
Reviewed-by: dholmes

! common/autoconf/generated-configure.sh
! common/autoconf/hotspot.m4