am a840faef: am c35e7902: am 555b7770: Merge "Move the inclusion of depfile to where it\'s generated."

* commit 'a840faef517a196e235a197992e8feb9f13c27b7':
  Move the inclusion of depfile to where it's generated.