Merge "Move variable only used on aarch64." into main am: e0ec54b436

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

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