Merge "fix(versal): remove clock related macros" into integration