entropy: rename combined CABAC/SBac class to Entropy
Backed out changeset: cff4f6482385

This head was accidentally created.
Merge, discard accidental push