Merge android11-5.4.60+ (22550de6) into msm-5.4

* refs/heads/tmp-22550de6:
  ANDROID: GKI: Update abi_gki_aarch64_exynos
  ANDROID: tty: fix tty name overflow
  Revert "tracing: Move pipe reference to trace array instead of current_tracer"
  Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4"
  ANDROID: arm64: add __va_function
  ANDROID: ABI: fix ABI breakage
  ANDROID: sched: add vendor hook for correcting cpu capacity
  ANDROID: Revert: Merge 5.4.60 into android11-5.4
  ANDROID: sched: Use normal vendor hook in scheduler tick
  ANDROID: Add vendor hooks to the scheduler

Conflicts:
	drivers/base/arch_topology.c
	kernel/sched/core.c
	kernel/sched/rt.c

Change-Id: Id8e3bf41c77302eb907891b38ff8b7e7d4c586f4
Signed-off-by: Blagovest Kolenichev <bkolenichev@codeaurora.org>