am 458076c3: Merge "Fix the ALIGN and ALIGNBYTES macros for LP64."

* commit '458076c3c7f41c72e0d1ae8da23907f75427ca3a':
  Fix the ALIGN and ALIGNBYTES macros for LP64.