ANDROID: arm64: Remove a bunch of duplicate errata hunks

Fix some merging errors.  Quells the following WARN() output:

  Duplicate entry for capability 62
  WARNING: CPU: 0 PID: 0 at arch/arm64/kernel/cpufeature.c:958 init_cpu_hwcaps_indirect_list_from_array+0x7c/0x98

Bug: 315739115
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I4e8798cc6395050a54222ec68432fae3c286dd87