Reverted Ubuntu workaround in CLibs.h
Merge branch 'testbed' of https://github.com/des-testbed/Ara-Sim into testbed