Another take at TT alignment

This time revert to original version but using
uintptr_t instead of size_t

Suggested by Lucas.

No functional change.
Merge remote-tracking branch 'upstream/master'
MSVC platform.h cleanup