Merge "Fix SDK build."