Revert "mm: fix merge errors"

This reverts commit 4edc3684576c27c4a9ad91aaea38ad136490d71f.
build script: fail if other tasks fail