Merge "Fix bad debug info due to 64-bit registers alignment"