Merge "Remove ALIGNBYTES and ALIGN from <sys/param.h>"