Recommit r235219, it's need for out-of-tree users of AlignOf.h.