Merge "AArch64: fixing some assertions."