Merge "encoder: Return gracefully from entropy encoding errors"