Merge pull request #2497 from Sonicadvance1/aarch64_minor_opt [AArch64] Minor bugfix and optimization.
