Merge "[patch] AArch64: reclass system arch tweaks"