Merge remote-tracking branch 'origin/master' into xc7mux

diff --cc passes/techmap/abc9.cc
Simple merge

diff --cc techlibs/xilinx/cells_map.v
Simple merge

diff --cc techlibs/xilinx/cells_sim.v
Simple merge

diff --cc techlibs/xilinx/synth_xilinx.cc
Simple merge