Merge "AArch64: Correction for LP64"