Merge "Fix the SDK build."