am 8af726b2: am 7b0d9b79: Merge "Restore posix_memalign"

* commit '8af726b24fbb9ab545719bd3980a4f0ad9bcb8a8':
  Restore posix_memalign