Fix bug in layout and broken debug assertion in collect to f-order array#900

bluss merged 2 commits intomasterrust-ndarray/ndarray:masterfrom

fix-zip-collect-bug-with-frust-ndarray/ndarray:fix-zip-collect-bug-with-fCopy head branch name to clipboard