am 21e6e2de: Merge "Change generated dependency file names"

* commit '21e6e2de1f0062f949fcc52d0b4559dfa3246e0e':
  Change generated dependency file names