change more files to aries-common only (had doubles)

Change-Id: I2c7ecc5684ccf37076295770b6a59a5a56801597