Merge "Bugfixes for AArch64."