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

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