Merge "arm64: Add CNTVCT_EL0 cp15 AArch32 trap handler"