Merge "Replace last -includes by .KATI_DEPFILE" am: c26ec724b8
am: 082d5e5081

* commit '082d5e5081732c6c4d42069b2f3fd560dcce768d':
  Replace last -includes by .KATI_DEPFILE