Merge "Add dependencies on classes.jar for soong modules"