Merge "Move variable only used on aarch64." into main am: e0ec54b4 am: 70f98e40

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3242487



Change-Id: If4e025a216a098f88e528ed1e50e6f232b6e2cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>