am f797dc2b: am 944edb56: Merge "Switch to the new mmma implementation using make goals."

* commit 'f797dc2b929489599df09a2311d246ad8da1aee5':
  Switch to the new mmma implementation using make goals.