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

Change-Id: I82aa023b881f277d419fdcdf09cd510b804217c2