Merge "Revert "Remove -d keepdepfile from ninja command line"" am: 6548b54dfd am: 88f14b6bb7
am: d46f4795ef

Change-Id: I49c3fe05eba8e4db5a1e4caec89dd41d3cde9d28