Merge "Fixed ASM_ALIGN macro"