adding back two missed changes back to cmakelists and amdhip.def Change-Id: Ibe0ed655d3590f0add13c20b160078ae005feaaf