Merge "respect alignment in arm asm files"