Merge "Align up java-lib-files and java-lib-deps."