Merge "Revert "Make sdk depend on merged srcjar instead of monolith""