am 0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."

* commit '0c0b2e659fe52dc1901677b74dc390c52b1b5e3b':
  Use unmodified MAKECMDGOALS in ninja.mk.