am b384eb84: Merge "kati: Handle MAKECMDGOALS modifications"

* commit 'b384eb84c3bbea9630d805f5825320e7f9acc2ba':
  kati: Handle MAKECMDGOALS modifications