Merge "Move java_api_contributions closer to their source"