hg: panama/dev: Automatic merge with foreign

[maurizio.cimadamore at oracle.com]

Changeset: 04ce3009afc1
Author:    mcimadamore
Date:      2018-10-05 02:34 +0200
URL:       http://hg.openjdk.java.net/panama/dev/rev/04ce3009afc1

Automatic merge with foreign

! src/hotspot/cpu/x86/macroAssembler_x86.hpp
! src/java.base/share/classes/module-info.java