Merge "fix(zynqmp): workaround issue around cntpct_el0" into integration