Log Message:
Move option-specific dependencies, tools and variables to their
respective options. Reduces dependencies when not building C++ or Java.