Merge "Don't add dependencies on Makefiles when using ninja"