Merge "Make SDK build happy for the combined v4 binary"