Merge "Restore posix_memalign"