Merge "Re-submit "Make sdk depend on merged srcjar instead of monolith""