UPSTREAM: arm64: move to ESR_ELx macros

Now that we have common ESR_ELx_* macros, move the core arm64 code over
to them.

There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>

Bug: 31432001
Change-Id: Ib259a44264096f6891563867f3e8d721c0ded271
(cherry picked from commit aed40e0144bdbdadb45f2b623e07aa3157eb74c9)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>