hg: panama/dev: Automatic merge with foreign

[maurizio.cimadamore at oracle.com]

Changeset: 8b4e77b8636e
Author:    mcimadamore
Date:      2018-12-14 02:24 +0100
URL:       http://hg.openjdk.java.net/panama/dev/rev/8b4e77b8636e

Automatic merge with foreign

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