Merge "Make: Don't rely on presence of tools.jar in toolchain."