[TF-A] [PATCHv6 3/3] arm-virt: combine code for secure and non secure pl061