Merge "Revert "Use dependency files generated by llvm-rs-cc for Java""