Merge "Provide java_defaults as a counterpart to the settings.mk file"