Merge branch 'merge-ams' into 'master'

MPSoC/Makefile.forsoclib

MPSoC/mutekh/libsyscams/gpio2vci_address.c

MPSoC/mutekh/libsyscams/gpio2vci_iface.c

...reaming_component/gpio2vci/caba/source/include/gpio2vci.h

...streaming_component/gpio2vci/caba/source/src/gpio2vci.cpp

...ming_component/gpio2vci/caba/source/src/gpio2vci.cpp-orig

modeling/SystemC-AMS/eln_in_tdf.xml

modeling/SystemC-AMS/my_eln_filter.xml

modeling/SystemC-AMS/rover_ams_single_dist_de_b.xml

modeling/SystemC-AMS/test.xml

modeling/SystemC-AMS/vibration_sensor.xml

modeling/SystemC-AMS/vibration_sensor_nosoclib.xml

src/main/java/ddtranslatorSoclib/Code.java

src/main/java/ddtranslatorSoclib/Declaration.java

src/main/java/ddtranslatorSoclib/Deployinfo.java

src/main/java/ddtranslatorSoclib/Header.java

src/main/java/ddtranslatorSoclib/Loader.java

src/main/java/ddtranslatorSoclib/MappingTable.java

src/main/java/ddtranslatorSoclib/NetList.java

src/main/java/ddtranslatorSoclib/Platforminfo.java