Merge "Do not align 64-bit registers during instruction expansion"