Mitigate `#[align]` name resolution ambiguity regression with a rename#144080

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

jieyouxu:realignjieyouxu/rust:realignCopy head branch name to clipboard