Updated for Portable.Text.Encoding API changes