am 7b0d9b79: Merge "Restore posix_memalign"

* commit '7b0d9b798474ab62d4bf67c79ae901f4c4789f27':
  Restore posix_memalign