Merge "Revert "Remove -d keepdepfile from ninja command line""